Merge branch 'staging' into staging-next
This commit is contained in:
Vladimír Čunát
+2
-2
@@ -24,7 +24,7 @@ insert_final_newline = false
|
||||
# see https://nixos.org/nixpkgs/manual/#chap-conventions
|
||||
|
||||
# Match json/lockfiles/markdown/nix/perl/python/ruby/shell/docbook files, set indent to spaces
|
||||
[*.{json,lock,md,nix,pl,pm,py,rb,sh,xml}]
|
||||
[*.{bash,json,lock,md,nix,pl,pm,py,rb,sh,xml}]
|
||||
indent_style = space
|
||||
|
||||
# Match docbook files, set indent width of one
|
||||
@@ -36,7 +36,7 @@ indent_size = 1
|
||||
indent_size = 2
|
||||
|
||||
# Match perl/python/shell scripts, set indent width of four
|
||||
[*.{pl,pm,py,sh}]
|
||||
[*.{bash,pl,pm,py,sh}]
|
||||
indent_size = 4
|
||||
|
||||
# Match gemfiles, set indent to spaces with width of two
|
||||
|
||||
@@ -234,9 +234,17 @@ Finally, there are some plugins that are also packaged in nodePackages because t
|
||||
|
||||
### Testing Neovim plugins {#testing-neovim-plugins}
|
||||
|
||||
`nvimRequireCheck=MODULE` is a simple test which checks if Neovim can requires the lua module `MODULE` without errors. This is often enough to catch missing dependencies.
|
||||
#### neovimRequireCheck {#testing-neovim-plugins-neovim-require-check}
|
||||
`neovimRequireCheck` is a simple test which checks if Neovim can requires lua modules without errors. This is often enough to catch missing dependencies.
|
||||
|
||||
This can be manually added through plugin definition overrides in the [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix).
|
||||
It accepts a single string for a module, or a list of module strings to test.
|
||||
- `nvimRequireCheck = MODULE;`
|
||||
- `nvimRequireCheck = [ MODULE1 MODULE2 ];`
|
||||
|
||||
When `neovimRequireCheck` is not specified, we will search the plugin's directory for lua modules to attempt loading. This quick smoke test can catch obvious dependency errors that might be missed.
|
||||
The check hook will fail the build if any failures are detected to encourage inspecting the logs to identify potential issues.
|
||||
|
||||
If you would like to only check a specific module, this can be manually added through plugin definition overrides in the [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix).
|
||||
|
||||
```nix
|
||||
gitsigns-nvim = super.gitsigns-nvim.overrideAttrs {
|
||||
@@ -244,6 +252,30 @@ This can be manually added through plugin definition overrides in the [overrides
|
||||
nvimRequireCheck = "gitsigns";
|
||||
};
|
||||
```
|
||||
Some plugins will have lua modules that require a user configuration to function properly or can contain optional lua modules that we dont want to test requiring.
|
||||
We can skip specific modules using `nvimSkipModule`. Similar to `nvimRequireCheck`, it accepts a single string or a list of strings.
|
||||
- `nvimSkipModule = MODULE;`
|
||||
- `nvimSkipModule = [ MODULE1 MODULE2 ];`
|
||||
|
||||
```nix
|
||||
asyncrun-vim = super.asyncrun-vim.overrideAttrs {
|
||||
nvimSkipModule = [
|
||||
# vim plugin with optional toggleterm integration
|
||||
"asyncrun.toggleterm"
|
||||
"asyncrun.toggleterm2"
|
||||
];
|
||||
};
|
||||
```
|
||||
|
||||
In rare cases, we might not want to actually test loading lua modules for a plugin. In those cases, we can disable `neovimRequireCheck` with `doCheck = false;`.
|
||||
|
||||
This can be manually added through plugin definition overrides in the [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix).
|
||||
```nix
|
||||
vim-test = super.vim-test.overrideAttrs {
|
||||
# Vim plugin with a test lua file
|
||||
doCheck = false;
|
||||
};
|
||||
```
|
||||
|
||||
### Plugin optional configuration {#vim-plugin-required-snippet}
|
||||
|
||||
|
||||
@@ -3760,6 +3760,9 @@
|
||||
"testing-neovim-plugins": [
|
||||
"index.html#testing-neovim-plugins"
|
||||
],
|
||||
"testing-neovim-plugins-neovim-require-check": [
|
||||
"index.html#testing-neovim-plugins-neovim-require-check"
|
||||
],
|
||||
"vim-plugin-required-snippet": [
|
||||
"index.html#vim-plugin-required-snippet"
|
||||
],
|
||||
|
||||
@@ -87,31 +87,24 @@ When that happens, the one with the highest version is always used.
|
||||
|
||||
The following is a list of Xcode versions, the SDK version in Nixpkgs, and the attribute to use to add it.
|
||||
Check your package’s documentation (platform support or installation instructions) to find which Xcode or SDK version to use.
|
||||
Generally, only the last SDK release for a major version is packaged (each _x_ in 10._x_ until 10.15 is considered a major version).
|
||||
Generally, only the last SDK release for a major version is packaged.
|
||||
|
||||
| Xcode version | SDK version | Nixpkgs attribute |
|
||||
|--------------------|---------------------------------------------------|-------------------|
|
||||
| Varies by platform | 10.12.2 (x86_64-darwin)<br/>11.3 (aarch64-darwin) | `apple-sdk` |
|
||||
| 8.0–8.3.3 | 10.12.2 | `apple-sdk_10_12` |
|
||||
| 9.0–9.4.1 | 10.13.2 | `apple-sdk_10_13` |
|
||||
| 10.0–10.3 | 10.14.6 | `apple-sdk_10_14` |
|
||||
| 11.0–11.7 | 10.15.6 | `apple-sdk_10_15` |
|
||||
| 12.0–12.5.1 | 11.3 | `apple-sdk_11` |
|
||||
| 13.0–13.4.1 | 12.3 | `apple-sdk_12` |
|
||||
| 14.0–14.3.1 | 13.3 | `apple-sdk_13` |
|
||||
| 15.0–15.4 | 14.4 | `apple-sdk_14` |
|
||||
| 16.0 | 15.0 | `apple-sdk_15` |
|
||||
| Xcode version | SDK version | Nixpkgs attribute |
|
||||
|--------------------|--------------------|------------------------------|
|
||||
| 12.0–12.5.1 | 11.3 | `apple-sdk_11` / `apple-sdk` |
|
||||
| 13.0–13.4.1 | 12.3 | `apple-sdk_12` |
|
||||
| 14.0–14.3.1 | 13.3 | `apple-sdk_13` |
|
||||
| 15.0–15.4 | 14.4 | `apple-sdk_14` |
|
||||
| 16.0 | 15.0 | `apple-sdk_15` |
|
||||
|
||||
|
||||
#### Darwin Default SDK versions {#sec-darwin-troubleshooting-darwin-defaults}
|
||||
|
||||
The current default versions of the deployment target (minimum version) and SDK are indicated by Darwin-specific attributes on the platform. Because of the ways that minimum version and SDK can be changed that are not visible to Nix, they should be treated as lower bounds.
|
||||
The current default version of the SDK and deployment target (minimum supported version) are indicated by the Darwin-specific platform attributes `darwinSdkVersion` and `darwinMinVersion`.
|
||||
Because of the ways that minimum version and SDK can be changed that are not visible to Nix, they should be treated as lower bounds.
|
||||
If you need to parameterize over a specific version, create a function that takes the version as a parameter instead of relying on these attributes.
|
||||
|
||||
- `darwinMinVersion` defaults to 10.12 on x86_64-darwin and 11.0 on aarch64-darwin.
|
||||
It sets the default deployment target.
|
||||
- `darwinSdkVersion` defaults to 10.12 on x86-64-darwin and 11.0 on aarch64-darwin.
|
||||
Only the major version determines the SDK version, resulting in the 10.12.2 and 11.3 SDKs being used on these platforms respectively.
|
||||
On macOS, the `darwinMinVersion` and `darwinSdkVersion` are always the same, and are currently set to 11.3.
|
||||
|
||||
|
||||
#### `xcrun` cannot find a binary {#sec-darwin-troubleshooting-xcrun}
|
||||
@@ -264,10 +257,10 @@ The legacy SDK provided two ways of overriding the default SDK.
|
||||
These are both being phased out along with the legacy SDKs.
|
||||
They have been updated to set up the new SDK for you, but you should replace them with doing that directly.
|
||||
|
||||
- `pkgs.darwin.apple_sdk_11_0.callPackage` - this pattern was used to provide frameworks from the 11.0 SDK.
|
||||
It now adds the `apple-sdk_11` package to your derivation’s build inputs.
|
||||
- `pkgs.darwin.apple_sdk_11_0.callPackage` - this pattern was used to provide frameworks from the macOS 11 SDK.
|
||||
It is now the same as `callPackage`.
|
||||
- `overrideSDK` - this stdenv adapter would try to replace the frameworks used by your derivation and its transitive dependencies.
|
||||
It now adds the `apple-sdk_11` package for `11.0` or the `apple-sdk_12` package for `12.3`.
|
||||
It now adds the `apple-sdk_12` package for `12.3` and does nothing for `11.0`.
|
||||
If `darwinMinVersion` is specified, it will add `darwinMinVersionHook` with the specified minimum version.
|
||||
No other SDK versions are supported.
|
||||
|
||||
|
||||
@@ -261,7 +261,7 @@ let
|
||||
else null;
|
||||
# The canonical name for this attribute is darwinSdkVersion, but some
|
||||
# platforms define the old name "sdkVer".
|
||||
darwinSdkVersion = final.sdkVer or (if final.isAarch64 then "11.0" else "10.12");
|
||||
darwinSdkVersion = final.sdkVer or "11.3";
|
||||
darwinMinVersion = final.darwinSdkVersion;
|
||||
darwinMinVersionVariable =
|
||||
if final.isMacOS then "MACOSX_DEPLOYMENT_TARGET"
|
||||
@@ -293,7 +293,7 @@ let
|
||||
# to an emulator program. That is, if an emulator requires additional
|
||||
# arguments, a wrapper should be used.
|
||||
if pkgs.stdenv.hostPlatform.canExecute final
|
||||
then "${pkgs.execline}/bin/exec"
|
||||
then lib.getExe (pkgs.writeShellScriptBin "exec" ''exec "$@"'')
|
||||
else if final.isWindows
|
||||
then "${wine}/bin/wine${optionalString (final.parsed.cpu.bits == 64) "64"}"
|
||||
else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux && final.qemuArch != null
|
||||
|
||||
@@ -35,15 +35,15 @@ Synopsis:
|
||||
This is usually done in the following cases:
|
||||
|
||||
1. Single target fix: current bootstrap files for a single target
|
||||
are problematic for some reason (target-specific bug). In this
|
||||
case we can refresh just that target as:
|
||||
are problematic for some reason (target-specific bug). In this
|
||||
case we can refresh just that target as:
|
||||
|
||||
\$ $0 --commit --targets=i686-unknown-linux-gnu
|
||||
\$ $0 --commit --targets=i686-unknown-linux-gnu
|
||||
|
||||
2. Routine refresh: all bootstrap files should be refreshed to avoid
|
||||
debugging problems that only occur on very old binaries.
|
||||
debugging problems that only occur on very old binaries.
|
||||
|
||||
\$ $0 --commit --all-targets
|
||||
\$ $0 --commit --all-targets
|
||||
|
||||
To get help on uploading refreshed binaries to 'tarballs.nixos.org'
|
||||
please have a look at <maintainers/scripts/bootstrap-files/README.md>.
|
||||
@@ -232,50 +232,50 @@ for target in "${targets[@]}"; do
|
||||
# - build time: ${build_time}
|
||||
{
|
||||
EOF
|
||||
for p in "${outpath}/on-server"/*; do
|
||||
fname=$(basename "$p")
|
||||
fnames+=("$fname")
|
||||
case "$fname" in
|
||||
bootstrap-tools.tar.xz) attr=bootstrapTools ;;
|
||||
busybox) attr=$fname ;;
|
||||
unpack.nar.xz) attr=unpack ;;
|
||||
*) die "Don't know how to map '$fname' to attribute name. Please update me."
|
||||
esac
|
||||
for p in "${outpath}/on-server"/*; do
|
||||
fname=$(basename "$p")
|
||||
fnames+=("$fname")
|
||||
case "$fname" in
|
||||
bootstrap-tools.tar.xz) attr=bootstrapTools ;;
|
||||
busybox) attr=$fname ;;
|
||||
unpack.nar.xz) attr=unpack ;;
|
||||
*) die "Don't know how to map '$fname' to attribute name. Please update me."
|
||||
esac
|
||||
|
||||
executable_arg=
|
||||
executable_nix=
|
||||
if [[ -x "$p" ]]; then
|
||||
executable_arg="--executable"
|
||||
executable_nix="executable = true;"
|
||||
fi
|
||||
unpack_nix=
|
||||
name_nix=
|
||||
if [[ $fname = *.nar.xz ]]; then
|
||||
unpack_nix="unpack = true;"
|
||||
name_nix="name = \"${fname%.nar.xz}\";"
|
||||
sri=$(nar_sri_get "$p" "${fname%.nar.xz}")
|
||||
[[ $? -ne 0 ]] && die "Failed to get hash of '$p'"
|
||||
else
|
||||
sha256=$(nix-prefetch-url $executable_arg --name "$fname" "file://$p")
|
||||
[[ $? -ne 0 ]] && die "Failed to get the hash for '$p'"
|
||||
sri=$(nix-hash --to-sri "sha256:$sha256")
|
||||
[[ $? -ne 0 ]] && die "Failed to convert '$sha256' hash to an SRI form"
|
||||
fi
|
||||
executable_arg=
|
||||
executable_nix=
|
||||
if [[ -x "$p" ]]; then
|
||||
executable_arg="--executable"
|
||||
executable_nix="executable = true;"
|
||||
fi
|
||||
unpack_nix=
|
||||
name_nix=
|
||||
if [[ $fname = *.nar.xz ]]; then
|
||||
unpack_nix="unpack = true;"
|
||||
name_nix="name = \"${fname%.nar.xz}\";"
|
||||
sri=$(nar_sri_get "$p" "${fname%.nar.xz}")
|
||||
[[ $? -ne 0 ]] && die "Failed to get hash of '$p'"
|
||||
else
|
||||
sha256=$(nix-prefetch-url $executable_arg --name "$fname" "file://$p")
|
||||
[[ $? -ne 0 ]] && die "Failed to get the hash for '$p'"
|
||||
sri=$(nix-hash --to-sri "sha256:$sha256")
|
||||
[[ $? -ne 0 ]] && die "Failed to convert '$sha256' hash to an SRI form"
|
||||
fi
|
||||
|
||||
# individual file entries
|
||||
cat <<EOF
|
||||
$attr = import <nix/fetchurl.nix> {
|
||||
# individual file entries
|
||||
cat <<EOF
|
||||
$attr = import <nix/fetchurl.nix> {
|
||||
url = "http://tarballs.nixos.org/${s3_prefix}/${nixpkgs_revision}/$fname";
|
||||
hash = "${sri}";$(
|
||||
[[ -n ${executable_nix} ]] && printf "\n %s" "${executable_nix}"
|
||||
[[ -n ${name_nix} ]] && printf "\n %s" "${name_nix}"
|
||||
[[ -n ${unpack_nix} ]] && printf "\n %s" "${unpack_nix}"
|
||||
)
|
||||
};
|
||||
)
|
||||
};
|
||||
EOF
|
||||
done
|
||||
# footer
|
||||
cat <<EOF
|
||||
done
|
||||
# footer
|
||||
cat <<EOF
|
||||
}
|
||||
EOF
|
||||
} > "${target_file}"
|
||||
|
||||
@@ -4,8 +4,19 @@
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
- The default PHP version has been updated to 8.3.
|
||||
- **This release of Nixpkgs requires macOS Big Sur 11.3 or newer, as announced in the 24.11 release notes.**
|
||||
We cannot guarantee that packages will continue to work on older versions of macOS.
|
||||
Future Nixpkgs releases will only support [macOS versions supported by Apple](https://endoflife.date/macos); this means that **Nixpkgs 25.11 will require macOS Sonoma 14 or newer**.
|
||||
Users on old macOS versions should consider upgrading to a supported version (potentially using [OpenCore Legacy Patcher](https://dortania.github.io/OpenCore-Legacy-Patcher/) for old hardware) or installing NixOS.
|
||||
If neither of those options are viable and you require new versions of software, [MacPorts](https://www.macports.org/) supports versions back to Mac OS X Snow Leopard 10.6.
|
||||
|
||||
- GCC has been updated from GCC 13 to GCC 14.
|
||||
This introduces some backwards‐incompatible changes; see the [upstream porting guide](https://gcc.gnu.org/gcc-14/porting_to.html) for details.
|
||||
|
||||
- LLVM has been updated from LLVM 16 (on Darwin) and LLVM 18 (on other platforms) to LLVM 19.
|
||||
This introduces some backwards‐incompatible changes; see the [upstream release notes](https://releases.llvm.org/) for details.
|
||||
|
||||
- The default PHP version has been updated to 8.3.
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
## New Modules {#sec-release-25.05-new-modules}
|
||||
|
||||
@@ -13,7 +13,6 @@ let
|
||||
filterAttrsRecursive
|
||||
hasPrefix
|
||||
makeLibraryPath
|
||||
match
|
||||
mkDefault
|
||||
mkEnableOption
|
||||
mkPackageOption
|
||||
@@ -108,10 +107,6 @@ let
|
||||
withCoralUSB = any (d: d.type == "edgetpu" && hasPrefix "usb" d.device or "") detectors;
|
||||
withCoralPCI = any (d: d.type == "edgetpu" && hasPrefix "pci" d.device or "") detectors;
|
||||
withCoral = withCoralPCI || withCoralUSB;
|
||||
|
||||
# Provide ffmpeg-full for NVIDIA hardware acceleration
|
||||
ffmpegArgs = cfg.settings.ffmpeg.hwaccel_args or "";
|
||||
ffmpeg' = if match "/nvidia/" ffmpegArgs != null then pkgs.ffmpeg-full else pkgs.ffmpeg-headless;
|
||||
in
|
||||
|
||||
{
|
||||
@@ -571,7 +566,7 @@ in
|
||||
path = with pkgs; [
|
||||
# unfree:
|
||||
# config.boot.kernelPackages.nvidiaPackages.latest.bin
|
||||
ffmpeg'
|
||||
ffmpeg-headless
|
||||
libva-utils
|
||||
procps
|
||||
radeontop
|
||||
|
||||
@@ -219,7 +219,7 @@ let
|
||||
succeed(
|
||||
'echo \'${postData}\'> /tmp/data.json'
|
||||
)
|
||||
succeed('sed -ie "s DATE $(date +%s) " /tmp/data.json')
|
||||
succeed('sed -i -e "s DATE $(date +%s) " /tmp/data.json')
|
||||
succeed(
|
||||
"curl -sSfH 'Content-Type: application/json' -X POST --data @/tmp/data.json localhost:9103/collectd"
|
||||
)
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fluidsynth";
|
||||
version = "2.3.6";
|
||||
version = "2.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FluidSynth";
|
||||
repo = "fluidsynth";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bmA4eUh7MC4dXPsOOi9Q5jneSE5OGUWrztv+46LxaW0=";
|
||||
hash = "sha256-4Jn8pyVPrTPYZGdPZB+8guxTbD6s/1OpmLJlioDQFMA=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
@@ -28,13 +28,15 @@ mkDerivation rec {
|
||||
substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}'
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
qmakeFlags="$qmakeFlags \
|
||||
CONFIG+=${lib.optionalString alsaSupport "acs_alsa"} \
|
||||
CONFIG+=${lib.optionalString jackSupport "acs_jack"} \
|
||||
CONFIG+=${lib.optionalString portaudioSupport "acs_portaudio"} \
|
||||
PREFIXSHORTCUT=$out"
|
||||
'';
|
||||
qmakeFlags = [
|
||||
"PREFIXSHORTCUT=${placeholder "out"}"
|
||||
] ++ lib.optionals alsaSupport [
|
||||
"CONFIG+=acs_alsa"
|
||||
] ++ lib.optionals jackSupport [
|
||||
"CONFIG+=acs_jack"
|
||||
] ++ lib.optionals portaudioSupport [
|
||||
"CONFIG+=acs_portaudio"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free Musical Instrument Tuner";
|
||||
|
||||
@@ -22,11 +22,11 @@ assert withConplay -> !libOnly;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "${lib.optionalString libOnly "lib"}mpg123";
|
||||
version = "1.32.8";
|
||||
version = "1.32.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2";
|
||||
hash = "sha256-/u4TdMeVQODkBd8LxF/eIK1nARQlw2GidZ4hRolKJ6c=";
|
||||
hash = "sha256-A7YeQATpYLrPKs2toD7ZTTduaqsnpgFEe9SQjYQHspE=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" ] ++ lib.optional withConplay "conplay";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config
|
||||
, alsa-lib, asio, avahi, boost179, flac, libogg, libvorbis, libopus, soxr
|
||||
, alsa-lib, asio, avahi, boost, flac, libogg, libvorbis, libopus, soxr
|
||||
, IOKit, AudioToolbox
|
||||
, aixlog, popl
|
||||
, pulseaudioSupport ? false, libpulseaudio
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
# snapcast also supports building against tremor but as we have libogg, that's
|
||||
# not needed
|
||||
buildInputs = [
|
||||
boost179
|
||||
boost
|
||||
asio avahi flac libogg libvorbis libopus
|
||||
aixlog popl soxr
|
||||
] ++ lib.optional pulseaudioSupport libpulseaudio
|
||||
|
||||
@@ -105,6 +105,7 @@ stdenv.mkDerivation rec {
|
||||
"-DUSE_SYSTEM_LIBS=ON"
|
||||
"-DBUILD_IMGUI_INTERFACE=${if withImGui then "ON" else "OFF"}"
|
||||
"-DWITH_QT_GUI_WEBENGINE=${if withTauWidget then "ON" else "OFF"}"
|
||||
"-DAPP_INSTALL_ROOT=${placeholder "out"}/app"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
@@ -136,9 +137,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Prebuild Ruby vendored dependencies and Qt docs
|
||||
./linux-prebuild.sh -o
|
||||
|
||||
# Append CMake flag depending on the value of $out
|
||||
cmakeFlags+=" -DAPP_INSTALL_ROOT=$out/app"
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ autoreconfHook, boost180, cargo, coreutils, curl, cxx-rs, db62, fetchFromGitHub
|
||||
{ autoreconfHook, boost, cargo, coreutils, curl, cxx-rs, db62, fetchFromGitHub
|
||||
, git, hexdump, lib, libevent, libsodium, makeWrapper, rustPlatform
|
||||
, pkg-config, Security, stdenv, testers, tl-expected, utf8cpp, util-linux, zcash, zeromq
|
||||
}:
|
||||
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
|
||||
nativeBuildInputs = [ autoreconfHook cargo cxx-rs git hexdump makeWrapper pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
boost180
|
||||
boost
|
||||
db62
|
||||
libevent
|
||||
libsodium
|
||||
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
|
||||
|
||||
configureFlags = [
|
||||
"--disable-tests"
|
||||
"--with-boost-libdir=${lib.getLib boost180}/lib"
|
||||
"--with-boost-libdir=${lib.getLib boost}/lib"
|
||||
"RUST_TARGET=${stdenv.hostPlatform.rust.rustcTargetSpec}"
|
||||
];
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
, Xaw3d
|
||||
, acl
|
||||
, alsa-lib
|
||||
, apple-sdk
|
||||
, autoreconfHook
|
||||
, cairo
|
||||
, dbus
|
||||
@@ -51,7 +52,7 @@
|
||||
, recurseIntoAttrs
|
||||
, sigtool
|
||||
, sqlite
|
||||
, substituteAll
|
||||
, replaceVars
|
||||
, systemd
|
||||
, tree-sitter
|
||||
, texinfo
|
||||
@@ -148,12 +149,12 @@ mkDerivation (finalAttrs: {
|
||||
inherit src;
|
||||
|
||||
patches = patches fetchpatch ++ lib.optionals withNativeCompilation [
|
||||
(substituteAll {
|
||||
src = if lib.versionOlder finalAttrs.version "29"
|
||||
(replaceVars (if lib.versionOlder finalAttrs.version "29"
|
||||
then ./native-comp-driver-options-28.patch
|
||||
else if lib.versionOlder finalAttrs.version "30"
|
||||
then ./native-comp-driver-options.patch
|
||||
else ./native-comp-driver-options-30.patch;
|
||||
else ./native-comp-driver-options-30.patch) {
|
||||
|
||||
backendPath = (lib.concatStringsSep " "
|
||||
(builtins.map (x: ''"-B${x}"'') ([
|
||||
# Paths necessary so the JIT compiler finds its libraries:
|
||||
@@ -163,6 +164,9 @@ mkDerivation (finalAttrs: {
|
||||
"${lib.getBin stdenv.cc.cc}/bin"
|
||||
"${lib.getBin stdenv.cc.bintools}/bin"
|
||||
"${lib.getBin stdenv.cc.bintools.bintools}/bin"
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# The linker needs to know where to find libSystem on Darwin.
|
||||
"${apple-sdk.sdkroot}/usr/lib"
|
||||
])));
|
||||
})
|
||||
];
|
||||
@@ -185,15 +189,15 @@ mkDerivation (finalAttrs: {
|
||||
# Reduce closure size by cleaning the environment of the emacs dumper
|
||||
''
|
||||
substituteInPlace src/Makefile.in \
|
||||
--replace 'RUN_TEMACS = ./temacs' 'RUN_TEMACS = env -i ./temacs'
|
||||
--replace-warn 'RUN_TEMACS = ./temacs' 'RUN_TEMACS = env -i ./temacs'
|
||||
''
|
||||
|
||||
''
|
||||
substituteInPlace lisp/international/mule-cmds.el \
|
||||
--replace /usr/share/locale ${gettext}/share/locale
|
||||
--replace-warn /usr/share/locale ${gettext}/share/locale
|
||||
|
||||
for makefile_in in $(find . -name Makefile.in -print); do
|
||||
substituteInPlace $makefile_in --replace /bin/pwd pwd
|
||||
substituteInPlace $makefile_in --replace-warn /bin/pwd pwd
|
||||
done
|
||||
''
|
||||
|
||||
|
||||
@@ -1,24 +1,136 @@
|
||||
#shellcheck shell=bash
|
||||
# Setup hook for checking whether Python imports succeed
|
||||
# Setup hook for checking whether Lua imports succeed
|
||||
echo "Sourcing neovim-require-check-hook.sh"
|
||||
|
||||
neovimRequireCheckHook () {
|
||||
# Discover modules automatically if nvimRequireCheck is not set
|
||||
discover_modules() {
|
||||
echo "Running module discovery in source directory..."
|
||||
|
||||
# Create unique lists so we can organize later
|
||||
modules=()
|
||||
|
||||
while IFS= read -r lua_file; do
|
||||
# Ignore certain infra directories
|
||||
if [[ "$lua_file" =~ debug/|scripts?/|tests?/|spec/ || "$lua_file" =~ .*\meta.lua ]]; then
|
||||
continue
|
||||
# Ignore optional telescope and lualine modules
|
||||
elif [[ "$lua_file" =~ ^lua/telescope/_extensions/(.+)\.lua || "$lua_file" =~ ^lua/lualine/(.+)\.lua ]]; then
|
||||
continue
|
||||
# Grab main module names
|
||||
elif [[ "$lua_file" =~ ^lua/([^/]+)/init.lua$ ]]; then
|
||||
echo "$lua_file"
|
||||
modules+=("${BASH_REMATCH[1]}")
|
||||
# Check other lua files
|
||||
elif [[ "$lua_file" =~ ^lua/(.*)\.lua$ ]]; then
|
||||
echo "$lua_file"
|
||||
# Replace slashes with dots to form the module name
|
||||
module_name="${BASH_REMATCH[1]//\//.}"
|
||||
modules+=("$module_name")
|
||||
elif [[ "$lua_file" =~ ^([^/.][^/]*)\.lua$ ]]; then
|
||||
echo "$lua_file"
|
||||
modules+=("${BASH_REMATCH[1]}")
|
||||
fi
|
||||
done < <(find "$src" -name '*.lua' | xargs -n 1 realpath --relative-to="$src")
|
||||
|
||||
nvimRequireCheck=("${modules[@]}")
|
||||
echo "Discovered modules: ${nvimRequireCheck[*]}"
|
||||
|
||||
if [ "${#nvimRequireCheck[@]}" -eq 0 ]; then
|
||||
echo "No valid Lua modules found; skipping check"
|
||||
return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
# Run require checks on each module in nvimRequireCheck
|
||||
run_require_checks() {
|
||||
echo "Starting require checks"
|
||||
check_passed=false
|
||||
failed_modules=()
|
||||
successful_modules=()
|
||||
|
||||
export HOME="$TMPDIR"
|
||||
local deps="${dependencies[*]}"
|
||||
local checks="${nativeBuildInputs[*]}"
|
||||
set +e
|
||||
for name in "${nvimRequireCheck[@]}"; do
|
||||
local skip=false
|
||||
for module in "${nvimSkipModule[@]}"; do
|
||||
if [[ "$module" == "$name" ]]; then
|
||||
echo "$name is in list of modules to not check. Skipping..."
|
||||
skip=true
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
if [ "$skip" = false ]; then
|
||||
echo "Attempting to require module: $name"
|
||||
if @nvimBinary@ -es --headless -n -u NONE -i NONE --clean -V1 \
|
||||
--cmd "set rtp+=$out,${deps// /,}" \
|
||||
--cmd "set rtp+=$out,${checks// /,}" \
|
||||
--cmd "lua require('$name')"; then
|
||||
check_passed=true
|
||||
successful_modules+=("$name")
|
||||
echo "Successfully required module: $name"
|
||||
else
|
||||
echo "Failed to require module: $name"
|
||||
failed_modules+=("$name")
|
||||
fi
|
||||
fi
|
||||
done
|
||||
set -e
|
||||
}
|
||||
|
||||
# Define color codes
|
||||
GREEN="\033[0;32m"
|
||||
RED="\033[0;31m"
|
||||
NC="\033[0m" # No Color
|
||||
|
||||
# Print summary of the require checks
|
||||
print_summary() {
|
||||
echo -e "\n======================================================"
|
||||
if [[ "$check_passed" == "true" ]]; then
|
||||
echo -e "${GREEN}Require check succeeded for the following modules:${NC}"
|
||||
for module in "${successful_modules[@]}"; do
|
||||
echo -e " ${GREEN}- $module${NC}"
|
||||
done
|
||||
echo "All lua modules were checked."
|
||||
else
|
||||
echo -e "${RED}No successful require checks.${NC}"
|
||||
fi
|
||||
|
||||
# Print any modules that failed with improved formatting and color
|
||||
if [ "${#failed_modules[@]}" -gt 0 ]; then
|
||||
echo -e "\n${RED}Require check failed for the following modules:${NC}"
|
||||
for module in "${failed_modules[@]}"; do
|
||||
echo -e " ${RED}- $module${NC}"
|
||||
done
|
||||
fi
|
||||
echo "======================================================"
|
||||
|
||||
if [ "${#failed_modules[@]}" -gt 0 ]; then
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Main entry point: orchestrates discovery, require checks, and summary
|
||||
neovimRequireCheckHook() {
|
||||
echo "Executing neovimRequireCheckHook"
|
||||
|
||||
if [ -n "$nvimRequireCheck" ]; then
|
||||
echo "Check whether the following module can be imported: $nvimRequireCheck"
|
||||
|
||||
# editorconfig-checker-disable
|
||||
export HOME="$TMPDIR"
|
||||
|
||||
local deps="${dependencies[*]}"
|
||||
@nvimBinary@ -es --headless -n -u NONE -i NONE --clean -V1 \
|
||||
--cmd "set rtp+=$out,${deps// /,}" \
|
||||
--cmd "lua require('$nvimRequireCheck')"
|
||||
if [ "${nvimRequireCheck[*]}" = "" ]; then
|
||||
echo "nvimRequireCheck is empty; entering discovery mode"
|
||||
# Auto-discovery mode
|
||||
if ! discover_modules; then
|
||||
echo "No modules found during discovery; exiting hook"
|
||||
return
|
||||
fi
|
||||
else
|
||||
echo "nvimRequireCheck is pre-populated; entering manual check mode"
|
||||
fi
|
||||
|
||||
run_require_checks
|
||||
print_summary
|
||||
}
|
||||
|
||||
echo "Using neovimRequireCheckHook"
|
||||
appendToVar preDistPhases neovimRequireCheckHook
|
||||
|
||||
|
||||
|
||||
@@ -466,6 +466,13 @@ in
|
||||
|
||||
cmp-dictionary = super.cmp-dictionary.overrideAttrs (oa: {
|
||||
nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
|
||||
nvimSkipModule = [
|
||||
# Test files
|
||||
"cmp_dictionary.dict.external_spec"
|
||||
"cmp_dictionary.dict.trie_spec"
|
||||
"cmp_dictionary.lib.trie_spec"
|
||||
"cmp_dictionary.lib.unknown_spec"
|
||||
];
|
||||
});
|
||||
|
||||
cmp-digraphs = super.cmp-digraphs.overrideAttrs (oa: {
|
||||
@@ -2897,6 +2904,10 @@ in
|
||||
"snacks.terminal"
|
||||
"snacks.win"
|
||||
"snacks.words"
|
||||
"snacks.debug"
|
||||
"snacks.scratch"
|
||||
# Optional trouble integration
|
||||
"trouble.sources.profiler"
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -499,8 +499,15 @@ rec {
|
||||
nativeBuildInputs =
|
||||
oldAttrs.nativeBuildInputs or [ ]
|
||||
++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||
vimCommandCheckHook
|
||||
vimGenDocHook
|
||||
];
|
||||
|
||||
doCheck = oldAttrs.doCheck or true;
|
||||
|
||||
nativeCheckInputs =
|
||||
oldAttrs.nativeCheckInputs or [ ]
|
||||
++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||
vimCommandCheckHook
|
||||
# many neovim plugins keep using buildVimPlugin
|
||||
neovimRequireCheckHook
|
||||
];
|
||||
|
||||
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
echo "tarring jdk"
|
||||
tar --checkpoint=10000 -czf build/linux/jdk-17.0.8-${arch}.tgz ${jdk}
|
||||
cp ${ant}/lib/ant/lib/{ant.jar,ant-launcher.jar} app/lib/
|
||||
cp ${ant.home}/lib/{ant.jar,ant-launcher.jar} app/lib/
|
||||
mkdir -p core/library
|
||||
ln -s ${jogl}/share/java/* core/library/
|
||||
ln -s ${vaqua} app/lib/VAqua9.jar
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
mkDerivation, lib, ghostscript, substituteAll,
|
||||
mkDerivation, lib, ghostscript, replaceVars,
|
||||
extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw, kdegraphics-mobipocket
|
||||
}:
|
||||
|
||||
@@ -15,9 +15,8 @@ mkDerivation {
|
||||
patches = [
|
||||
# Hardcode patches to Ghostscript so PDF thumbnails work OOTB.
|
||||
# Intentionally not doing the same for dvips because TeX is big.
|
||||
(substituteAll {
|
||||
(replaceVars ./gs-paths.patch {
|
||||
gs = "${ghostscript}/bin/gs";
|
||||
src = ./gs-paths.patch;
|
||||
})
|
||||
];
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ mkDerivation {
|
||||
protobuf_21 qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts
|
||||
knewstuff gpsd
|
||||
];
|
||||
preConfigure = ''
|
||||
cmakeFlags+=" -DINCLUDE_INSTALL_DIR=''${!outputDev}/include"
|
||||
'';
|
||||
cmakeFlags = [
|
||||
"-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
|
||||
];
|
||||
}
|
||||
|
||||
@@ -66,9 +66,9 @@ mkDerivation rec {
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
cmakeFlags+="-DQT5_PLUGINS_INSTALL_DIR=$out/$qtPluginPrefix"
|
||||
'';
|
||||
cmakeFlags = [
|
||||
"-DQT5_PLUGINS_INSTALL_DIR=${placeholder "out"}/$qtPluginPrefix"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Core libraries of Maliit and server";
|
||||
|
||||
@@ -261,6 +261,25 @@ buildStdenv.mkDerivation {
|
||||
hash = "sha256-2IpdSyye3VT4VB95WurnyRFtdN1lfVtYpgEiUVhfNjw=";
|
||||
})
|
||||
]
|
||||
++ [
|
||||
# LLVM 19 turned on WASM reference types by default, exposing a bug
|
||||
# that broke the Mozilla WASI build. Supposedly, it has been fixed
|
||||
# upstream in LLVM, but the build fails in the same way for us even
|
||||
# with LLVM 19 versions that contain the upstream patch.
|
||||
#
|
||||
# Apply the temporary patch Mozilla used to work around this bug
|
||||
# for now until someone can investigate what’s going on here.
|
||||
#
|
||||
# TODO: Please someone figure out what’s up with this.
|
||||
#
|
||||
# See: <https://bugzilla.mozilla.org/show_bug.cgi?id=1905251>
|
||||
# See: <https://github.com/llvm/llvm-project/pull/97451>
|
||||
(fetchpatch {
|
||||
name = "wasi-sdk-disable-reference-types.patch";
|
||||
url = "https://hg.mozilla.org/integration/autoland/raw-rev/23a9f6555c7c";
|
||||
hash = "sha256-CRywalJlRMFVLITEYXxpSq3jLPbUlWKNRHuKLwXqQfU=";
|
||||
})
|
||||
]
|
||||
++ extraPatches;
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
, sndio
|
||||
, libjack2
|
||||
, speechd-minimal
|
||||
, removeReferencesTo
|
||||
}:
|
||||
|
||||
## configurability of the wrapper itself
|
||||
@@ -242,7 +241,7 @@ let
|
||||
};
|
||||
}));
|
||||
|
||||
nativeBuildInputs = [ makeWrapper lndir jq removeReferencesTo ];
|
||||
nativeBuildInputs = [ makeWrapper lndir jq ];
|
||||
buildInputs = [ browser.gtk3 ];
|
||||
|
||||
|
||||
@@ -417,9 +416,6 @@ let
|
||||
passthru = { unwrapped = browser; };
|
||||
|
||||
disallowedRequisites = [ stdenv.cc ];
|
||||
postInstall = ''
|
||||
find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' +
|
||||
'';
|
||||
meta = browser.meta // {
|
||||
inherit (browser.meta) description;
|
||||
mainProgram = launcherName;
|
||||
|
||||
@@ -28,12 +28,12 @@ stdenv.mkDerivation rec {
|
||||
# /etc/{resolv.conf,hosts}, replace all references to `localhost'
|
||||
# by their IPv4 equivalent.
|
||||
find . \( -name \*.c -or -name \*.conf \) | \
|
||||
xargs sed -ie 's|\<localhost\>|127.0.0.1|g'
|
||||
xargs sed -i -e 's|\<localhost\>|127.0.0.1|g'
|
||||
|
||||
# Make sure the tests don't rely on `/tmp', for the sake of chroot
|
||||
# builds.
|
||||
find . \( -iname \*test\*.c -or -name \*.conf \) | \
|
||||
xargs sed -ie "s|/tmp|$TMPDIR|g"
|
||||
xargs sed -i -e "s|/tmp|$TMPDIR|g"
|
||||
'';
|
||||
|
||||
# unfortunately, there's still a few failures with impure tests
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
, alsa-lib
|
||||
, faac
|
||||
, faad2
|
||||
, fetchpatch
|
||||
, ffmpeg
|
||||
, glib
|
||||
, openh264
|
||||
@@ -85,6 +86,22 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-w+xyMNFmKylSheK0yAGl8J6MXly/HUjjAfR9Qq3s/kA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# GCC 14 compatibility
|
||||
(fetchpatch {
|
||||
url = "https://github.com/FreeRDP/FreeRDP/commit/5b14b7cbdd36414f1838047f21502654bd32ebb1.patch";
|
||||
hash = "sha256-EWLfmjGJGWA/sY2E2DnFKhPbzhOVbXZPCrV8i1XuSeY=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/FreeRDP/FreeRDP/commit/efa899d3deb8595a29fabb2a2251722f9d7e0d7f.patch";
|
||||
hash = "sha256-hjqNexYq+3iO2L2L9wT2tWbHz0BEtl/y7jgQT4kpNIM=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/FreeRDP/FreeRDP/commit/0c20fac8f1deeeca3df93a6619542e5d9176f0f0.patch";
|
||||
hash = "sha256-cEzNPteucoI5KoGEM3C6mg2kW9uWImPebZEV6nssexY=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
export HOME=$TMP
|
||||
|
||||
|
||||
@@ -48,6 +48,9 @@ stdenv.mkDerivation rec {
|
||||
(lib.enableFeature enableOpenSSL "openssl")
|
||||
(lib.enableFeature enableXXHash "xxhash")
|
||||
(lib.enableFeature enableZstd "zstd")
|
||||
# Feature detection does a runtime check which varies according to ipv6
|
||||
# availability, so force it on to make reproducible, see #360152.
|
||||
(lib.enableFeature true "ipv6")
|
||||
"--with-nobody-group=nogroup"
|
||||
|
||||
# disable the included zlib explicitly as it otherwise still compiles and
|
||||
|
||||
@@ -461,7 +461,7 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
"--enable-dbus"
|
||||
"--enable-release-build"
|
||||
"--enable-epm"
|
||||
"--with-ant-home=${getLib ant}/lib/ant"
|
||||
"--with-ant-home=${ant.home}"
|
||||
|
||||
# Without these, configure does not finish
|
||||
"--without-junit"
|
||||
|
||||
@@ -63,12 +63,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preConfigure = ''
|
||||
./_autosetup
|
||||
configureFlags="$configureFlags --sysconfdir=$out/etc"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [ "--disable-server" ] ++ lib.optionals headless [ "--disable-manager" ];
|
||||
configureFlags = [
|
||||
"--disable-server"
|
||||
"--sysconfdir=${placeholder "out"}/etc"
|
||||
] ++ lib.optionals headless [ "--disable-manager" ];
|
||||
|
||||
postInstall = ''
|
||||
install --mode=444 -D 'client/scripts/boinc-client.service' "$out/etc/systemd/system/boinc.service"
|
||||
|
||||
@@ -31,7 +31,6 @@
|
||||
, gtk3
|
||||
, gdk-pixbuf
|
||||
, argp-standalone
|
||||
, memorymappingHook
|
||||
, withGui ? true
|
||||
, withBitshuffle ? true
|
||||
}:
|
||||
@@ -211,8 +210,6 @@ stdenv.mkDerivation rec {
|
||||
] ++ lib.optionals withGui [ gtk3 gdk-pixbuf ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
argp-standalone
|
||||
] ++ lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64) [
|
||||
memorymappingHook
|
||||
]
|
||||
++ lib.optionals withBitshuffle [ hdf5-external-filter-plugins ];
|
||||
|
||||
|
||||
@@ -147,14 +147,14 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
#bad configure.ac and Makefile.in everywhere
|
||||
preConfigure = ''
|
||||
sed -ie 's;-L/usr/local/lib -R/usr/local/lib;;g' \
|
||||
sed -i -e 's;-L/usr/local/lib -R/usr/local/lib;;g' \
|
||||
main/Makefile.in \
|
||||
tool/mlfc/Makefile.in \
|
||||
tool/mlimgloader/Makefile.in \
|
||||
tool/mlconfig/Makefile.in \
|
||||
uitoolkit/libtype/Makefile.in \
|
||||
uitoolkit/libotl/Makefile.in
|
||||
sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' \
|
||||
sed -i -e 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' \
|
||||
tool/mlconfig/po/Makefile.in.in
|
||||
#utmp and mlterm-fb
|
||||
substituteInPlace configure.in \
|
||||
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
configureFlags="$configureFlags --with-lablgtk-dir=$(echo ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2)"
|
||||
appendToVar configureFlags "--with-lablgtk-dir=$(echo ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2)"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -45,6 +45,7 @@ let
|
||||
flask
|
||||
sqlalchemy
|
||||
];
|
||||
disabledTests = [ "test_persist_selectable" ];
|
||||
});
|
||||
|
||||
# flask-sqlalchemy 2.x requires flask 2.x
|
||||
@@ -72,6 +73,7 @@ let
|
||||
hash = "sha256-83doVvfdpymlAB0EbfrHmuoKE5B2LJbFq+AY2xGpnl4=";
|
||||
})
|
||||
];
|
||||
nativeCheckInputs = oldAttrs.nativeCheckInputs or [] ++ [ self.pytest-xprocess ];
|
||||
});
|
||||
|
||||
# sourcehut is not (yet) compatible with factory-boy 3.x
|
||||
|
||||
@@ -14,9 +14,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preConfigure = ''
|
||||
autoconf
|
||||
makeFlags="$makeFlags PREFIX=$out"
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = ''
|
||||
A little C program that prints a short string with barebones information
|
||||
|
||||
@@ -214,10 +214,10 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
# Need these tools on the build system when cross compiling,
|
||||
# hacky, but have found no other way.
|
||||
CXX=$CXX_FOR_BUILD LD=ld make -C tools/depends/native/JsonSchemaBuilder
|
||||
cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin"
|
||||
appendToVar cmakeFlags "-DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin"
|
||||
|
||||
CXX=$CXX_FOR_BUILD LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker
|
||||
cmakeFlags+=" -DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin"
|
||||
appendToVar cmakeFlags "-DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin"
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -29,7 +29,8 @@ rec {
|
||||
extract = args@{ pname, version, name ? null, postExtract ? "", src, ... }:
|
||||
assert lib.assertMsg (name == null) "The `name` argument is deprecated. Use `pname` and `version` instead to construct the name.";
|
||||
pkgs.runCommand "${pname}-${version}-extracted" {
|
||||
buildInputs = [ appimage-exec ];
|
||||
nativeBuildInputs = [ appimage-exec ];
|
||||
strictDeps = true;
|
||||
} ''
|
||||
appimage-exec.sh -x $out ${src}
|
||||
${postExtract}
|
||||
|
||||
@@ -343,10 +343,6 @@ stdenvNoCC.mkDerivation {
|
||||
done
|
||||
''
|
||||
|
||||
+ optionalString targetPlatform.isDarwin ''
|
||||
echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags
|
||||
''
|
||||
|
||||
##
|
||||
## GNU specific extra strip flags
|
||||
##
|
||||
|
||||
@@ -77,7 +77,7 @@ for my $p (@pathsToLink) {
|
||||
sub findFiles;
|
||||
|
||||
sub findFilesInDir {
|
||||
my ($relName, $target, $ignoreCollisions, $checkCollisionContents, $priority) = @_;
|
||||
my ($relName, $target, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority) = @_;
|
||||
|
||||
opendir DIR, "$target" or die "cannot open `$target': $!";
|
||||
my @names = readdir DIR or die;
|
||||
@@ -85,7 +85,7 @@ sub findFilesInDir {
|
||||
|
||||
foreach my $name (@names) {
|
||||
next if $name eq "." || $name eq "..";
|
||||
findFiles("$relName/$name", "$target/$name", $name, $ignoreCollisions, $checkCollisionContents, $priority);
|
||||
findFiles("$relName/$name", "$target/$name", $name, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -115,11 +115,16 @@ sub prependDangling {
|
||||
}
|
||||
|
||||
sub findFiles {
|
||||
my ($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority) = @_;
|
||||
my ($relName, $target, $baseName, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority) = @_;
|
||||
|
||||
# The store path must not be a file
|
||||
# The store path must not be a file when not ignoreSingleFileOutputs
|
||||
if (-f $target && isStorePath $target) {
|
||||
die "The store path $target is a file and can't be merged into an environment using pkgs.buildEnv!";
|
||||
if ($ignoreSingleFileOutputs) {
|
||||
warn "The store path $target is a file and can't be merged into an environment using pkgs.buildEnv";
|
||||
return;
|
||||
} else {
|
||||
die "The store path $target is a file and can't be merged into an environment using pkgs.buildEnv!";
|
||||
}
|
||||
}
|
||||
|
||||
# Urgh, hacky...
|
||||
@@ -188,8 +193,8 @@ sub findFiles {
|
||||
}
|
||||
}
|
||||
|
||||
findFilesInDir($relName, $oldTarget, $ignoreCollisions, $checkCollisionContents, $oldPriority) unless $oldTarget eq "";
|
||||
findFilesInDir($relName, $target, $ignoreCollisions, $checkCollisionContents, $priority);
|
||||
findFilesInDir($relName, $oldTarget, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $oldPriority) unless $oldTarget eq "";
|
||||
findFilesInDir($relName, $target, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority);
|
||||
|
||||
$symlinks{$relName} = ["", $priority]; # denotes directory
|
||||
}
|
||||
@@ -199,12 +204,12 @@ my %done;
|
||||
my %postponed;
|
||||
|
||||
sub addPkg {
|
||||
my ($pkgDir, $ignoreCollisions, $checkCollisionContents, $priority) = @_;
|
||||
my ($pkgDir, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority) = @_;
|
||||
|
||||
return if (defined $done{$pkgDir});
|
||||
$done{$pkgDir} = 1;
|
||||
|
||||
findFiles("", $pkgDir, "", $ignoreCollisions, $checkCollisionContents, $priority);
|
||||
findFiles("", $pkgDir, "", $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority);
|
||||
|
||||
my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages";
|
||||
if (-e $propagatedFN) {
|
||||
|
||||
@@ -23,6 +23,9 @@ lib.makeOverridable
|
||||
, # Whether to ignore collisions or abort.
|
||||
ignoreCollisions ? false
|
||||
|
||||
# Whether to ignore outputs that are a single file instead of a directory.
|
||||
, ignoreSingleFileOutputs ? false
|
||||
|
||||
, # Whether to include closures of all input paths.
|
||||
includeClosures ? false
|
||||
|
||||
@@ -51,6 +54,8 @@ lib.makeOverridable
|
||||
|
||||
, passthru ? {}
|
||||
, meta ? {}
|
||||
, pname ? null
|
||||
, version ? null
|
||||
}:
|
||||
let
|
||||
chosenOutputs = map (drv: {
|
||||
@@ -75,8 +80,8 @@ let
|
||||
(lib.remove null)
|
||||
];
|
||||
in runCommand name
|
||||
rec {
|
||||
inherit manifest ignoreCollisions checkCollisionContents passthru
|
||||
(rec {
|
||||
inherit manifest ignoreCollisions checkCollisionContents ignoreSingleFileOutputs passthru
|
||||
meta pathsToLink extraPrefix postBuild
|
||||
nativeBuildInputs buildInputs;
|
||||
pkgs = builtins.toJSON chosenOutputs;
|
||||
@@ -85,7 +90,11 @@ in runCommand name
|
||||
allowSubstitutes = false;
|
||||
# XXX: The size is somewhat arbitrary
|
||||
passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else [ ];
|
||||
}
|
||||
} // lib.optionalAttrs (pname != null) {
|
||||
inherit pname;
|
||||
} // lib.optionalAttrs (version != null) {
|
||||
inherit version;
|
||||
})
|
||||
''
|
||||
${buildPackages.perl}/bin/perl -w ${builder}
|
||||
eval "$postBuild"
|
||||
|
||||
@@ -629,6 +629,20 @@ stdenvNoCC.mkDerivation {
|
||||
echo " -L${libcxx_solib}" >> $out/nix-support/cc-ldflags
|
||||
''
|
||||
|
||||
## Prevent clang from seeing /usr/include. There is a desire to achieve this
|
||||
## through alternate means because it breaks -sysroot and related functionality.
|
||||
#
|
||||
# This flag prevents global system header directories from
|
||||
# leaking through on non‐NixOS Linux. However, on macOS, the
|
||||
# SDK path is used as the sysroot, and forcing `-nostdlibinc`
|
||||
# breaks `-isysroot` with an unwrapped compiler. As macOS has
|
||||
# no `/usr/include`, there’s essentially no risk to dropping
|
||||
# the flag there. See discussion in NixOS/nixpkgs#191152.
|
||||
#
|
||||
+ optionalString ((cc.isClang or false) && !targetPlatform.isDarwin) ''
|
||||
echo " -nostdlibinc" >> $out/nix-support/cc-cflags
|
||||
''
|
||||
|
||||
##
|
||||
## Man page and info support
|
||||
##
|
||||
@@ -682,10 +696,6 @@ stdenvNoCC.mkDerivation {
|
||||
done
|
||||
''
|
||||
|
||||
+ optionalString targetPlatform.isDarwin ''
|
||||
echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags
|
||||
''
|
||||
|
||||
+ optionalString targetPlatform.isAndroid ''
|
||||
echo "-D__ANDROID_API__=${targetPlatform.androidSdkVersion}" >> $out/nix-support/cc-cflags
|
||||
''
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
, skopeo
|
||||
, stdenv
|
||||
, storeDir ? builtins.storeDir
|
||||
, substituteAll
|
||||
, symlinkJoin
|
||||
, tarsum
|
||||
, util-linux
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
runtimeShell,
|
||||
stdenvNoCC,
|
||||
callPackage,
|
||||
substituteAll,
|
||||
writeShellScript,
|
||||
makeWrapper,
|
||||
dotnetCorePackages,
|
||||
|
||||
@@ -51,10 +51,6 @@
|
||||
# Go build flags.
|
||||
, GOFLAGS ? [ ]
|
||||
|
||||
# Needed for buildFlags{,Array} warning
|
||||
, buildFlags ? "" # deprecated
|
||||
, buildFlagsArray ? "" # deprecated
|
||||
|
||||
, ...
|
||||
}@args':
|
||||
|
||||
@@ -208,8 +204,6 @@ in
|
||||
'');
|
||||
|
||||
buildPhase = args.buildPhase or (
|
||||
lib.warnIf (buildFlags != "" || buildFlagsArray != "")
|
||||
"`buildFlags`/`buildFlagsArray` are deprecated and will be removed in the 24.11 release. Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`"
|
||||
lib.warnIf (builtins.elem "-buildid=" ldflags)
|
||||
"`-buildid=` is set by default as ldflag by buildGoModule"
|
||||
''
|
||||
@@ -227,12 +221,13 @@ in
|
||||
buildGoDir() {
|
||||
local cmd="$1" dir="$2"
|
||||
|
||||
declare -ga buildFlagsArray
|
||||
declare -a flags
|
||||
flags+=($buildFlags "''${buildFlagsArray[@]}")
|
||||
flags+=(''${tags:+-tags=''${tags// /,}})
|
||||
flags+=(''${ldflags:+-ldflags="$ldflags"})
|
||||
flags+=("-p" "$NIX_BUILD_CORES")
|
||||
if (( "''${NIX_DEBUG:-0}" >= 1 )); then
|
||||
flags+=(-x)
|
||||
fi
|
||||
|
||||
if [ "$cmd" = "test" ]; then
|
||||
flags+=(-vet=off)
|
||||
@@ -262,10 +257,6 @@ in
|
||||
fi
|
||||
}
|
||||
|
||||
if (( "''${NIX_DEBUG:-0}" >= 1 )); then
|
||||
buildFlagsArray+=(-x)
|
||||
fi
|
||||
|
||||
if [ -z "$enableParallelBuilding" ]; then
|
||||
export NIX_BUILD_CORES=1
|
||||
fi
|
||||
|
||||
@@ -24,9 +24,9 @@ checkComposerValidate() {
|
||||
setComposerRootVersion
|
||||
|
||||
if [ "1" == "${composerGlobal-}" ]; then
|
||||
global="global";
|
||||
global="global";
|
||||
else
|
||||
global="";
|
||||
global="";
|
||||
fi
|
||||
|
||||
command="composer ${global} validate --strict --quiet --no-interaction --no-check-all --no-check-lock"
|
||||
|
||||
@@ -22,9 +22,9 @@ setComposerEnvVariables() {
|
||||
|
||||
checkComposerValidate() {
|
||||
if [ "1" == "${composerGlobal-}" ]; then
|
||||
global="global";
|
||||
global="global";
|
||||
else
|
||||
global="";
|
||||
global="";
|
||||
fi
|
||||
|
||||
command="composer ${global} validate --strict --quiet --no-interaction --no-check-all --no-check-lock"
|
||||
|
||||
@@ -48,7 +48,7 @@ stdenv.mkDerivation (
|
||||
|
||||
# Prefix hackery because of a bug in stdenv (it tries to `mkdir
|
||||
# $prefix', which doesn't work due to the DESTDIR).
|
||||
configureFlags="--prefix=$prefix $configureFlags"
|
||||
prependToVar configureFlags "--prefix=$prefix"
|
||||
dontAddPrefix=1
|
||||
prefix=$TMPDIR/inst$prefix
|
||||
'';
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
|
||||
Any unmatched variable names in the file at the provided path will cause a build failure.
|
||||
|
||||
Any remaining text that matches `@[A-Za-z_][0-9A-Za-z_'-]@` in the output after replacement
|
||||
has occurred will cause a build failure.
|
||||
By default, any remaining text that matches `@[A-Za-z_][0-9A-Za-z_'-]@` in the output after replacement
|
||||
has occurred will cause a build failure. Variables can be excluded from this check by passing "null" for them.
|
||||
|
||||
# Inputs
|
||||
|
||||
@@ -20,7 +20,8 @@
|
||||
: The file in which to replace variables.
|
||||
|
||||
`attrs` (AttrsOf String)
|
||||
: Each entry in this set corresponds to a `--subst-var-by` entry in [`substitute`](https://nixos.org/manual/nixpkgs/stable/#fun-substitute).
|
||||
: Each entry in this set corresponds to a `--subst-var-by` entry in [`substitute`](https://nixos.org/manual/nixpkgs/stable/#fun-substitute) or
|
||||
null to keep it unchanged.
|
||||
|
||||
# Example
|
||||
|
||||
@@ -36,13 +37,19 @@ path: attrs:
|
||||
|
||||
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: [
|
||||
"--replace-fail"
|
||||
(lib.escapeShellArg "@${name}@")
|
||||
(lib.escapeShellArg value)
|
||||
];
|
||||
subst-var-by =
|
||||
name: value:
|
||||
lib.optionals (value != null) [
|
||||
"--replace-fail"
|
||||
(lib.escapeShellArg "@${name}@")
|
||||
(lib.escapeShellArg value)
|
||||
];
|
||||
|
||||
replacements = lib.concatLists (lib.mapAttrsToList subst-var-by attrs);
|
||||
|
||||
left-overs = map ({ name, ... }: name) (
|
||||
builtins.filter ({ value, ... }: value == null) (lib.attrsToList attrs)
|
||||
);
|
||||
in
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
@@ -62,13 +69,15 @@ stdenvNoCC.mkDerivation {
|
||||
# Look for Nix identifiers surrounded by `@` that aren't substituted.
|
||||
checkPhase =
|
||||
let
|
||||
regex = lib.escapeShellArg "@[a-zA-Z_][0-9A-Za-z_'-]*@";
|
||||
lookahead =
|
||||
if builtins.length left-overs == 0 then "" else "(?!${builtins.concatStringsSep "|" left-overs}@)";
|
||||
regex = lib.escapeShellArg "@${lookahead}[a-zA-Z_][0-9A-Za-z_'-]*@";
|
||||
in
|
||||
''
|
||||
runHook preCheck
|
||||
if grep -qe ${regex} "$out"; then
|
||||
if grep -Pqe ${regex} "$out"; then
|
||||
echo The following look like unsubstituted Nix identifiers that remain in "$out":
|
||||
grep -oe ${regex} "$out"
|
||||
grep -Poe ${regex} "$out"
|
||||
echo Use the more precise '`substitute`' function if this check is in error.
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -128,8 +128,6 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg
|
||||
|
||||
cargoCheckFeatures = checkFeatures;
|
||||
|
||||
patchRegistryDeps = ./patch-registry-deps;
|
||||
|
||||
nativeBuildInputs = nativeBuildInputs ++ lib.optionals auditable [
|
||||
(buildPackages.cargo-auditable-cargo-wrapper.override {
|
||||
inherit cargo cargo-auditable;
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
for dir in pkg-config-*; do
|
||||
[ -d "$dir" ] || continue
|
||||
|
||||
echo "Patching pkg-config registry dep"
|
||||
|
||||
substituteInPlace "$dir/src/lib.rs" \
|
||||
--replace '"/usr"' '"'"$NIX_STORE"'/"'
|
||||
done
|
||||
@@ -10,7 +10,7 @@
|
||||
runCommandWith,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
substituteAll,
|
||||
replaceVars,
|
||||
testers,
|
||||
}:
|
||||
# Documentation is in doc/build-helpers/testers.chapter.md
|
||||
@@ -24,7 +24,7 @@
|
||||
testBuildFailure = drv: drv.overrideAttrs (orig: {
|
||||
builder = buildPackages.bash;
|
||||
args = [
|
||||
(substituteAll { coreutils = buildPackages.coreutils; src = ./expect-failure.sh; })
|
||||
(replaceVars ./expect-failure.sh { coreutils = buildPackages.coreutils; })
|
||||
orig.realBuilder or stdenv.shell
|
||||
] ++ orig.args or ["-e" (orig.builder or ../../stdenv/generic/default-builder.sh)];
|
||||
});
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
diff --git a/configure.in b/configure.in
|
||||
index b753a5bb3e..ee7d546984 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -134,12 +134,12 @@
|
||||
AC_SUBST(SHLIBFILE)
|
||||
AC_SUBST(SHLIBSONAME)
|
||||
|
||||
-SHLIBFORLINK='libadns.so'
|
||||
-SHLIBSONAME='$(SHLIBFORLINK).$(MAJOR)'
|
||||
-SHLIBFILE='$(SHLIBSONAME).$(MINOR)'
|
||||
+SHLIBFORLINK='libadns.dylib'
|
||||
+SHLIBSONAME='libadns.$(MAJOR).dylib'
|
||||
+SHLIBFILE='libadns.$(MAJOR).$(MINOR).dylib'
|
||||
|
||||
SHLIBCC='$(CC) $(CFLAGS) -fpic'
|
||||
-MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME) -o'
|
||||
+MKSHLIB_1='$(CC) $(LDFLAGS) -shared -Wl,-install_name,$(libdir)/$(SHLIBFILE) -o'
|
||||
MKSHLIB_2=''
|
||||
MKSHLIB_3='-lc'
|
||||
|
||||
@@ -1,44 +1,48 @@
|
||||
{ stdenv, lib, fetchurl, gnum4, gitUpdater }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
gnum4,
|
||||
autoreconfHook,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "adns";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz"
|
||||
"mirror://gnu/adns/adns-${version}.tar.gz"
|
||||
"https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${finalAttrs.version}.tar.gz"
|
||||
"mirror://gnu/adns/adns-${finalAttrs.version}.tar.gz"
|
||||
];
|
||||
hash = "sha256-cTizeJt1Br1oP0UdT32FMHepGAO3s12G7GZ/D5zUAc0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gnum4 ];
|
||||
patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./darwin.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gnum4
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
configureFlags = lib.optional stdenv.hostPlatform.isStatic "--disable-dynamic";
|
||||
|
||||
preConfigure =
|
||||
lib.optionalString stdenv.hostPlatform.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure";
|
||||
|
||||
# Autogenerated headers miss interdependencies in Makefile, fail parallel build:
|
||||
# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51329
|
||||
enableParallelBuilding = false;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01347.html for details.
|
||||
doCheck = false;
|
||||
|
||||
postInstall = let suffix = lib.versions.majorMinor version;
|
||||
in lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
install_name_tool -id $out/lib/libadns.so.${suffix} $out/lib/libadns.so.${suffix}
|
||||
'';
|
||||
doInstallCheck = true;
|
||||
|
||||
# darwin executables fail, but I don't want to fail the 100-500 packages depending on this lib
|
||||
doInstallCheck = !stdenv.hostPlatform.isDarwin;
|
||||
installCheckPhase = ''
|
||||
set -eo pipefail
|
||||
runHook preInstallCheck
|
||||
|
||||
for prog in $out/bin/*; do
|
||||
$prog --help > /dev/null && echo $(basename $prog) shows usage
|
||||
done
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
@@ -46,11 +50,15 @@ stdenv.mkDerivation rec {
|
||||
rev-prefix = "adns-";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "http://www.chiark.greenend.org.uk/~ian/adns/";
|
||||
description = "Asynchronous DNS Resolver Library";
|
||||
license = licenses.lgpl2;
|
||||
description = "Asynchronous DNS resolver library";
|
||||
license = [
|
||||
lib.licenses.gpl3Plus
|
||||
|
||||
platforms = platforms.unix;
|
||||
# `adns.h` only
|
||||
lib.licenses.lgpl2Plus
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -24,27 +24,27 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/lib/ant
|
||||
mv * $out/lib/ant/
|
||||
mkdir -p $out/bin $out/share/ant
|
||||
mv * $out/share/ant/
|
||||
|
||||
# Get rid of the manual (35 MiB). Maybe we should put this in a
|
||||
# separate output. Keep the antRun script since it's vanilla sh
|
||||
# and needed for the <exec/> task (but since we set ANT_HOME to
|
||||
# a weird value, we have to move antRun to a weird location).
|
||||
# Get rid of the other Ant scripts since we provide our own.
|
||||
mv $out/lib/ant/bin/antRun $out/bin/
|
||||
rm -rf $out/lib/ant/{manual,bin,WHATSNEW}
|
||||
mkdir $out/lib/ant/bin
|
||||
mv $out/bin/antRun $out/lib/ant/bin/
|
||||
mv $out/share/ant/bin/antRun $out/bin/
|
||||
rm -rf $out/share/ant/{manual,bin,WHATSNEW}
|
||||
mkdir $out/share/ant/bin
|
||||
mv $out/bin/antRun $out/share/ant/bin/
|
||||
|
||||
# Install ant-contrib.
|
||||
unpackFile $contrib
|
||||
cp -p ant-contrib/ant-contrib-*.jar $out/lib/ant/lib/
|
||||
cp -p ant-contrib/ant-contrib-*.jar $out/share/ant/lib/
|
||||
|
||||
cat >> $out/bin/ant <<EOF
|
||||
#! ${stdenv.shell} -e
|
||||
|
||||
ANT_HOME=$out/lib/ant
|
||||
ANT_HOME=$out/share/ant
|
||||
|
||||
# Find the JDK by looking for javac. As a fall-back, find the
|
||||
# JRE by looking for java. The latter allows just the JRE to be
|
||||
@@ -85,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
home = "${finalAttrs.finalPackage}/share/ant";
|
||||
updateScript = gitUpdater {
|
||||
rev-prefix = "rel/";
|
||||
url = "https://gitbox.apache.org/repos/asf/ant";
|
||||
|
||||
@@ -27,11 +27,7 @@ fetchurl {
|
||||
mv "$downloadedFile" "$renamed"
|
||||
pbzx "$renamed" | cpio -idm
|
||||
|
||||
# SDKs are inconsistent about whether MacOSX.sdk or MacOSX<version>.sdk is a symlink.
|
||||
src=Library/Developer/CommandLineTools/SDKs/MacOSX${lib.versions.majorMinor version}.sdk
|
||||
if [ ! -d $src ]; then
|
||||
src=Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
|
||||
fi
|
||||
|
||||
# Remove unwanted binaries, man pages, and folders from the SDK.
|
||||
rm -rf $src/usr/bin $src/usr/share $src/System/Library/Perl
|
||||
|
||||
@@ -24,7 +24,6 @@ self: super: {
|
||||
+ ''
|
||||
echo "Removing the following dylibs from the libSystem reexported libraries list: ${lib.escapeShellArg (lib.concatStringsSep ", " removedDylibs)}"
|
||||
for libSystem in libSystem.B.tbd libSystem.B_asan.tbd; do
|
||||
test ! -e usr/lib/$libSystem && continue # TODO: remove once the minimum SDK is 10.14 or newer.
|
||||
tapi stubify --filetype=tbd-v5 usr/lib/$libSystem -o usr/lib/$libSystem # tbd-v5 is a JSON-based format.
|
||||
jq --argjson libs ${lib.escapeShellArg (builtins.toJSON removedDylibs)} '
|
||||
if .libraries then
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
{ lib, sdkVersion }:
|
||||
|
||||
let
|
||||
name = "MacOSX${lib.versions.majorMinor sdkVersion}.sdk";
|
||||
in
|
||||
self: super: {
|
||||
# Rewrite the stubs to point to dylibs in the SDK instead of at system locations. This is needed for umbrella
|
||||
# frameworks in older SDKs, which don’t also embed their stubs.
|
||||
buildPhase =
|
||||
super.buildPhase or ""
|
||||
+ ''
|
||||
echo "Rewriting stubs to reference the SDK location in the store"
|
||||
find . -name '*.tbd' -type f -exec sed -E \
|
||||
-e "/^install-name/n; s|( \\|'\\|\"\\|\\[)/usr/|\1$sdkpath/${name}/usr/|g" \
|
||||
-e "/^install-name/n; s|( \\|'\\|\"\\|\\[)/System/|\1$sdkpath/${name}/System/|g" \
|
||||
-i {} \;
|
||||
'';
|
||||
}
|
||||
@@ -1,716 +1,4 @@
|
||||
{
|
||||
"10.12.2": {
|
||||
"CarbonHeaders": {
|
||||
"hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
|
||||
"version": "18.1"
|
||||
},
|
||||
"CommonCrypto": {
|
||||
"hash": "sha256-1mCJjZLBMIftcsKC7Ihhzi6LRS3u7kJzh9/dy6MY1Hg=",
|
||||
"version": "60092.30.2"
|
||||
},
|
||||
"IOAudioFamily": {
|
||||
"hash": "sha256-5t3D44H/h0cUZqAjMi56BTbJD4o+R0xVdHJ1sZLYgNM=",
|
||||
"version": "205.11"
|
||||
},
|
||||
"IOBDStorageFamily": {
|
||||
"hash": "sha256-4NpWcqfkp3UxhKKAwomDK3zxQ9DagyYFUVoUcrHo1Rg=",
|
||||
"version": "18"
|
||||
},
|
||||
"IOCDStorageFamily": {
|
||||
"hash": "sha256-XOwdBFunLbwyasnTKQC6MRlXxGns07JvcAQc6AQ1Zt4=",
|
||||
"version": "56"
|
||||
},
|
||||
"IODVDStorageFamily": {
|
||||
"hash": "sha256-bbGzqJnenEL9hRyKMBif/381/ETO+yNYHhlnXXWLne0=",
|
||||
"version": "41.1"
|
||||
},
|
||||
"IOFWDVComponents": {
|
||||
"hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=",
|
||||
"version": "208"
|
||||
},
|
||||
"IOFireWireAVC": {
|
||||
"hash": "sha256-rhZdjNoZ3OuHVLClhe9tMQU6qJs3IOHEqJ5TaNRJRnM=",
|
||||
"version": "424"
|
||||
},
|
||||
"IOFireWireFamily": {
|
||||
"hash": "sha256-adOI5uhd6QL4zpo4MK4ttmS1lcKseqmr68C1D/juGo0=",
|
||||
"version": "465"
|
||||
},
|
||||
"IOFireWireSBP2": {
|
||||
"hash": "sha256-5UWldDuSyAnRYjgIKllY4VNbxtAUawrlRS46+8FnbPs=",
|
||||
"version": "427"
|
||||
},
|
||||
"IOFireWireSerialBusProtocolTransport": {
|
||||
"hash": "sha256-a/xnnR2dUSWVMyTlkxJPa7cWk20RHl0Zh2Ot2pSEkF0=",
|
||||
"version": "252"
|
||||
},
|
||||
"IOGraphics": {
|
||||
"hash": "sha256-63XDVmEHu+KUdr06S7+RPi1BgLcAl4GZZRy+K96CvA0=",
|
||||
"version": "513.1"
|
||||
},
|
||||
"IOHIDFamily": {
|
||||
"hash": "sha256-BUDj89w4DrnsIxJZNIx3ZJ85c22HMchIVhJI7xREWTM=",
|
||||
"version": "870.31.1"
|
||||
},
|
||||
"IOKitUser": {
|
||||
"hash": "sha256-XJnOp5AtStXUim19GLev8MSM8iS5U8rRSnm7cNp/B80=",
|
||||
"version": "1324.30.13"
|
||||
},
|
||||
"IONetworkingFamily": {
|
||||
"hash": "sha256-dL1wSu72uzAAoMdgSjitXgHviioVIGdkDXqwY6HT5/g=",
|
||||
"version": "116.1.1"
|
||||
},
|
||||
"IOSerialFamily": {
|
||||
"hash": "sha256-ZcZ5F+a4u2AHThO5WyLn3/o42DR+YDBZKTy4P2EhHhk=",
|
||||
"version": "91"
|
||||
},
|
||||
"IOStorageFamily": {
|
||||
"hash": "sha256-IjsG/lgdtW04WH/5rb1QAT563Oy4O5fUrTGuA1kBrkY=",
|
||||
"version": "210.30.1"
|
||||
},
|
||||
"IOUSBFamily": {
|
||||
"hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=",
|
||||
"version": "630.4.5"
|
||||
},
|
||||
"Libc": {
|
||||
"hash": "sha256-wyt5CJnNzk0MPC6pg2JAdiwIPxWFJsO9Yqa83vY+hLc=",
|
||||
"version": "1158.30.7"
|
||||
},
|
||||
"Libinfo": {
|
||||
"hash": "sha256-3Mu9lOkaQx5gmNPXzr67FnZvKWmQhryIPsN6k95TU18=",
|
||||
"version": "503.30.1"
|
||||
},
|
||||
"Libm": {
|
||||
"hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=",
|
||||
"version": "2026"
|
||||
},
|
||||
"Libnotify": {
|
||||
"hash": "sha256-msGtbR53SHXjYN8i74gmkYWGkmqg+TcRO7TY/23XSFQ=",
|
||||
"version": "165.20.1"
|
||||
},
|
||||
"Librpcsvc": {
|
||||
"hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=",
|
||||
"version": "26"
|
||||
},
|
||||
"Libsystem": {
|
||||
"hash": "sha256-FwI2aD3wSwES/sKkr014BdFLfsKeEefgS0Pne1FGOp0=",
|
||||
"version": "1238"
|
||||
},
|
||||
"OpenDirectory": {
|
||||
"hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=",
|
||||
"version": "146"
|
||||
},
|
||||
"Security": {
|
||||
"hash": "sha256-Ya+ZO3bHNhQ+vZZx/lE7x+uMROHYWYKvm2ZZ1vClu3Q=",
|
||||
"version": "57740.31.2"
|
||||
},
|
||||
"architecture": {
|
||||
"hash": "sha256-gHUfKWc1uahI/IATafY1ppPAWnYUghOEXWK2lknAfrQ=",
|
||||
"version": "268"
|
||||
},
|
||||
"configd": {
|
||||
"hash": "sha256-i1UjnU7xBh7jCrGZxWMGrldzDrk2dDvjpthp/kq9OKo=",
|
||||
"version": "888.30.2"
|
||||
},
|
||||
"copyfile": {
|
||||
"hash": "sha256-pth+37uTfuFY94HuA4b/5GleDjidAuXVsBEQBUa3xCE=",
|
||||
"version": "138"
|
||||
},
|
||||
"dtrace": {
|
||||
"hash": "sha256-dK0N3l02241A5S1uvxZhqArHrTxd5Sd4JoAl6RBa8/8=",
|
||||
"version": "209.20.4"
|
||||
},
|
||||
"dyld": {
|
||||
"hash": "sha256-wyVsmqYgKLdMKZsLOHzOLag+mBnH0kNS6XAv4zuNTT4=",
|
||||
"version": "421.2"
|
||||
},
|
||||
"eap8021x": {
|
||||
"hash": "sha256-XSbzuNXyDJAADcnZed4Akmg1SK8P1IGrZitmhV3wzlo=",
|
||||
"version": "246.30.1"
|
||||
},
|
||||
"hfs": {
|
||||
"hash": "sha256-7ByUP59FXmmrxC5yJYUQxrkgt/vY7vZMl5JPQ0HfoS8=",
|
||||
"version": "366.30.3"
|
||||
},
|
||||
"launchd": {
|
||||
"hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=",
|
||||
"version": "842.1.4"
|
||||
},
|
||||
"libclosure": {
|
||||
"hash": "sha256-hfXKQDRdgEDVyT+3v/EuQZyXNd0abD2tICYdQNfhtwY=",
|
||||
"version": "67"
|
||||
},
|
||||
"libdispatch": {
|
||||
"hash": "sha256-tj4+6V4FL/XVON13UH71schElTm4/IKtPJH/yoUgRY0=",
|
||||
"version": "703.30.5"
|
||||
},
|
||||
"libmalloc": {
|
||||
"hash": "sha256-q9zcUy8YTsRds6RYJMIUIY/MULQ19uKiNduMXP3D7hA=",
|
||||
"version": "116.30.3"
|
||||
},
|
||||
"libplatform": {
|
||||
"hash": "sha256-k9Pd+TJCrNS7K100og+6bLAZjV/0VUTy8SIOsc+SE6Q=",
|
||||
"version": "126.1.2"
|
||||
},
|
||||
"libpthread": {
|
||||
"hash": "sha256-FJaJO4lXIMAIwEmVF6mHE4ZZZoPI8ZIVuMKLojEsESE=",
|
||||
"version": "218.30.1"
|
||||
},
|
||||
"mDNSResponder": {
|
||||
"hash": "sha256-LYDkkmgyfWKK6AMINXyrXo5kw7+lxUcz+4Ckq9175vA=",
|
||||
"version": "765.30.11"
|
||||
},
|
||||
"objc4": {
|
||||
"hash": "sha256-WfhJo+/KPGr3/OuV5Kg2no48UR7VVVarh9TB3VFSCQ4=",
|
||||
"version": "706"
|
||||
},
|
||||
"ppp": {
|
||||
"hash": "sha256-eW62wL8C1GZ2+5aN0dTPsdoEu6FWf+6XEYv8OiEeMfY=",
|
||||
"version": "838"
|
||||
},
|
||||
"removefile": {
|
||||
"hash": "sha256-EJYU6eHggyRsezClEWkGJmgePIdtyF4rpFD4kSK5Czw=",
|
||||
"version": "45"
|
||||
},
|
||||
"xnu": {
|
||||
"hash": "sha256-pkELzbsWPtm9H31LaRkaVjkQpPDxG9E93TNS+K9nqhE=",
|
||||
"version": "3789.31.2"
|
||||
}
|
||||
},
|
||||
"10.13.2": {
|
||||
"CarbonHeaders": {
|
||||
"hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
|
||||
"version": "18.1"
|
||||
},
|
||||
"CommonCrypto": {
|
||||
"hash": "sha256-3vx4HPlHP8PNi1GodeRh2iOEhyRBct3vX0Guc8060+I=",
|
||||
"version": "60118.30.2"
|
||||
},
|
||||
"IOAudioFamily": {
|
||||
"hash": "sha256-UG09Dc+up5cJKDHPpCmo11IsBchqZ72hVBPx8y+1klw=",
|
||||
"version": "206.5"
|
||||
},
|
||||
"IOBDStorageFamily": {
|
||||
"hash": "sha256-aaS5jWPRX4be8d3Rigq+kXzi9Zwbr8dHcNgcIz0n66o=",
|
||||
"version": "19"
|
||||
},
|
||||
"IOCDStorageFamily": {
|
||||
"hash": "sha256-U6v+Gj+IumU8Aha5+uf3yOU0Z4KMuBh7aXnJqiZ/abY=",
|
||||
"version": "58"
|
||||
},
|
||||
"IODVDStorageFamily": {
|
||||
"hash": "sha256-JLp4xN0Rdb2VpuXtVTODYNqQthDEZk+g/lvHRwJHQB4=",
|
||||
"version": "42"
|
||||
},
|
||||
"IOFWDVComponents": {
|
||||
"hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=",
|
||||
"version": "208"
|
||||
},
|
||||
"IOFireWireAVC": {
|
||||
"hash": "sha256-4JS+oezknezxud2E2ojYdSx7A8Z9Q4rddetAoUMU1es=",
|
||||
"version": "425"
|
||||
},
|
||||
"IOFireWireFamily": {
|
||||
"hash": "sha256-+FPlhMN2h1iCg1GAqH8+MwHG3GIs4DvvE3QGABX+3Rg=",
|
||||
"version": "468"
|
||||
},
|
||||
"IOFireWireSBP2": {
|
||||
"hash": "sha256-5UWldDuSyAnRYjgIKllY4VNbxtAUawrlRS46+8FnbPs=",
|
||||
"version": "427"
|
||||
},
|
||||
"IOFireWireSerialBusProtocolTransport": {
|
||||
"hash": "sha256-a/xnnR2dUSWVMyTlkxJPa7cWk20RHl0Zh2Ot2pSEkF0=",
|
||||
"version": "252"
|
||||
},
|
||||
"IOGraphics": {
|
||||
"hash": "sha256-E0wDkVmSeEcyO6L6OeWEQuZ0Ggh7MUkfqeQ9uLUEK/g=",
|
||||
"version": "517.22"
|
||||
},
|
||||
"IOHIDFamily": {
|
||||
"hash": "sha256-9FhH53LyP1Yv2/afmr/lpNhl/GNFb/Yg+VpG5Ycg300=",
|
||||
"version": "1035.30.15"
|
||||
},
|
||||
"IOKitUser": {
|
||||
"hash": "sha256-LebulFJ4KJ5Vbcjj6SC70cmed/0vhCVYo5qDxCw85SE=",
|
||||
"version": "1445.31.1"
|
||||
},
|
||||
"IONetworkingFamily": {
|
||||
"hash": "sha256-gXGFCSn6JnHOVaRKhGXFYdvJBo/AGBMDrUdIcw/CwqI=",
|
||||
"version": "124.30.1"
|
||||
},
|
||||
"IOSerialFamily": {
|
||||
"hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=",
|
||||
"version": "93"
|
||||
},
|
||||
"IOStorageFamily": {
|
||||
"hash": "sha256-Jo+0XlNi82KGksyrvUGyVPfmPMlTrDmZ75DT2lH66TY=",
|
||||
"version": "218.30.1"
|
||||
},
|
||||
"IOUSBFamily": {
|
||||
"hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=",
|
||||
"version": "630.4.5"
|
||||
},
|
||||
"Libc": {
|
||||
"hash": "sha256-js2xU5dMF5j209F9Cufuq5WzqcyNusbJDyuPpMgYEZU=",
|
||||
"version": "1244.30.3"
|
||||
},
|
||||
"Libinfo": {
|
||||
"hash": "sha256-pVVLb8eOuLVc4HHGcgpl7dqT+Tg2xqKQIQroyLj5OEg=",
|
||||
"version": "517.30.1"
|
||||
},
|
||||
"Libm": {
|
||||
"hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=",
|
||||
"version": "2026"
|
||||
},
|
||||
"Libnotify": {
|
||||
"hash": "sha256-nsWWqelTEP4nPJI3vG897zpSOxYOgpm8TUVJ04MrWU4=",
|
||||
"version": "172"
|
||||
},
|
||||
"Librpcsvc": {
|
||||
"hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=",
|
||||
"version": "26"
|
||||
},
|
||||
"Libsystem": {
|
||||
"hash": "sha256-+VFJoiqEtXUcP8ERUxtrKwTWZmgdppr+0oPUxSgIF+c=",
|
||||
"version": "1252"
|
||||
},
|
||||
"OpenDirectory": {
|
||||
"hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=",
|
||||
"version": "146"
|
||||
},
|
||||
"Security": {
|
||||
"hash": "sha256-W3bSTDCjj2ftq0wbDp+Z8QfD6TpF4p0fLrVjx2AmvfY=",
|
||||
"version": "58286.31.2"
|
||||
},
|
||||
"architecture": {
|
||||
"hash": "sha256-gHUfKWc1uahI/IATafY1ppPAWnYUghOEXWK2lknAfrQ=",
|
||||
"version": "268"
|
||||
},
|
||||
"configd": {
|
||||
"hash": "sha256-1YGIbAES4OONFtC2xxXWbM7Htlz2kKtFUULWqBB6fz0=",
|
||||
"version": "963.30.1"
|
||||
},
|
||||
"copyfile": {
|
||||
"hash": "sha256-CYTZwieSu1Fm9TLaaevfxDngAPRkEfewY+TgJrREed8=",
|
||||
"version": "146.30.2"
|
||||
},
|
||||
"dtrace": {
|
||||
"hash": "sha256-sgLSbCp9tYZ7ws2jgxB3NaAk+ijsIbmybsi0gkbZjFQ=",
|
||||
"version": "262"
|
||||
},
|
||||
"dyld": {
|
||||
"hash": "sha256-b1hM+iQl7ihRjHRL4Rcg5AHv5HSyKErVkTb+5KFF2P4=",
|
||||
"version": "519.2.2"
|
||||
},
|
||||
"eap8021x": {
|
||||
"hash": "sha256-KZsnzH5JiLfzY3zjMAlJRPCGY5EioW6aDJnMAemZJUY=",
|
||||
"version": "264.30.3"
|
||||
},
|
||||
"hfs": {
|
||||
"hash": "sha256-Ine8EFpW1kuNDn/r66abGyvYm+NSGI5TV3v/OlgyIME=",
|
||||
"version": "407.30.1"
|
||||
},
|
||||
"launchd": {
|
||||
"hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=",
|
||||
"version": "842.1.4"
|
||||
},
|
||||
"libclosure": {
|
||||
"hash": "sha256-hfXKQDRdgEDVyT+3v/EuQZyXNd0abD2tICYdQNfhtwY=",
|
||||
"version": "67"
|
||||
},
|
||||
"libdispatch": {
|
||||
"hash": "sha256-rvsvtv9VncLxQHoURBBczrTaSgbw5827Qf2TxAPopqA=",
|
||||
"version": "913.30.4"
|
||||
},
|
||||
"libmalloc": {
|
||||
"hash": "sha256-VM5jHQYqDkoGmrQ2UugTu+XOLjd1YPqdfddzQkKfhiY=",
|
||||
"version": "140.1.1"
|
||||
},
|
||||
"libplatform": {
|
||||
"hash": "sha256-zQ3MYqQoMCsfgG6frwnG3LfKWwauTzgwhoADXVUiGR0=",
|
||||
"version": "161.20.1"
|
||||
},
|
||||
"libpthread": {
|
||||
"hash": "sha256-6NLKbnBXikSfqz0ZWF6MOIq/bQK/CmfQNvkNXCU6lcw=",
|
||||
"version": "301.30.1"
|
||||
},
|
||||
"mDNSResponder": {
|
||||
"hash": "sha256-anzilyXeGh8LL3cYvuLRdqGzhHUvSp9eILJWAltL18M=",
|
||||
"version": "878.30.4"
|
||||
},
|
||||
"objc4": {
|
||||
"hash": "sha256-+4o+EzD0YQhgfTg/W9SbVDol7wWUIFxVAVTGg4OVfHQ=",
|
||||
"version": "723"
|
||||
},
|
||||
"ppp": {
|
||||
"hash": "sha256-eUIFlYHsAPRrBS0TpTP1/TacaK8h/5QM2Xl1T46MdWc=",
|
||||
"version": "847"
|
||||
},
|
||||
"removefile": {
|
||||
"hash": "sha256-EJYU6eHggyRsezClEWkGJmgePIdtyF4rpFD4kSK5Czw=",
|
||||
"version": "45"
|
||||
},
|
||||
"xnu": {
|
||||
"hash": "sha256-x2k0KyNk4mIodXfYDHjaCKR1CsiE3HYBNN6p5SfGIMU=",
|
||||
"version": "4570.31.3"
|
||||
}
|
||||
},
|
||||
"10.14.6": {
|
||||
"CarbonHeaders": {
|
||||
"hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
|
||||
"version": "18.1"
|
||||
},
|
||||
"CommonCrypto": {
|
||||
"hash": "sha256-hqsLaS7LEPu8t/bNuV4VUUbMteCetf3/o8e2X0iQvOo=",
|
||||
"version": "60118.250.2"
|
||||
},
|
||||
"IOAudioFamily": {
|
||||
"hash": "sha256-UG09Dc+up5cJKDHPpCmo11IsBchqZ72hVBPx8y+1klw=",
|
||||
"version": "206.5"
|
||||
},
|
||||
"IOBDStorageFamily": {
|
||||
"hash": "sha256-aaS5jWPRX4be8d3Rigq+kXzi9Zwbr8dHcNgcIz0n66o=",
|
||||
"version": "19"
|
||||
},
|
||||
"IOCDStorageFamily": {
|
||||
"hash": "sha256-U6v+Gj+IumU8Aha5+uf3yOU0Z4KMuBh7aXnJqiZ/abY=",
|
||||
"version": "58"
|
||||
},
|
||||
"IODVDStorageFamily": {
|
||||
"hash": "sha256-JLp4xN0Rdb2VpuXtVTODYNqQthDEZk+g/lvHRwJHQB4=",
|
||||
"version": "42"
|
||||
},
|
||||
"IOFWDVComponents": {
|
||||
"hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=",
|
||||
"version": "208"
|
||||
},
|
||||
"IOFireWireAVC": {
|
||||
"hash": "sha256-EXGpObJVC0b9X3xxEXJScDlM6xygmK3MoCbng21XCmg=",
|
||||
"version": "426"
|
||||
},
|
||||
"IOFireWireFamily": {
|
||||
"hash": "sha256-a8zEWhwQTzgGKg75RBmDXb1pgJr602IxnPBTFkKEqSM=",
|
||||
"version": "473"
|
||||
},
|
||||
"IOFireWireSBP2": {
|
||||
"hash": "sha256-lpYBTL9TzreyxJn4J3vfuXoWMH/4y8FnNKk5YiuDgHI=",
|
||||
"version": "433"
|
||||
},
|
||||
"IOFireWireSerialBusProtocolTransport": {
|
||||
"hash": "sha256-4Y+5+5cJtolSrM3AUnnhSBS3RrKXbg9Kh1ynmllOA2E=",
|
||||
"version": "252.250.2"
|
||||
},
|
||||
"IOGraphics": {
|
||||
"hash": "sha256-QFT+h0gtc7SUf0HNciknG0aMOQXnsWCR25C04dgK1/A=",
|
||||
"version": "530.66"
|
||||
},
|
||||
"IOHIDFamily": {
|
||||
"hash": "sha256-DpYcxGLvk10iz5TG2SO8R+5obEJv+zLK56RzA/pH0KA=",
|
||||
"version": "1090.270.6"
|
||||
},
|
||||
"IOKitUser": {
|
||||
"hash": "sha256-QH2m6BCYtO2JDksH0TebrEldjjZdC4U9otVu/uUoyWY=",
|
||||
"version": "1483.260.4"
|
||||
},
|
||||
"IONetworkingFamily": {
|
||||
"hash": "sha256-M01+Bhf7CTJMA7StjSRFW6ffq7Qf/IOh7aM+JI3ONe8=",
|
||||
"version": "129.200.1"
|
||||
},
|
||||
"IOSerialFamily": {
|
||||
"hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=",
|
||||
"version": "93"
|
||||
},
|
||||
"IOStorageFamily": {
|
||||
"hash": "sha256-X6s/IyApMQ7zo1wO7IpIk1e94tSsmvvT+fZHThMWv5Y=",
|
||||
"version": "218.260.1"
|
||||
},
|
||||
"IOUSBFamily": {
|
||||
"hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=",
|
||||
"version": "630.4.5"
|
||||
},
|
||||
"Libc": {
|
||||
"hash": "sha256-mhhs8U/oZku9o2kqzLW4K8Xv9QbnKNBbBr+Q6NqC1vQ=",
|
||||
"version": "1272.250.1"
|
||||
},
|
||||
"Libinfo": {
|
||||
"hash": "sha256-DUbyWZI+n3WvftlI7aj60CoEHb9y18H1+FYiYQroVEE=",
|
||||
"version": "517.200.9"
|
||||
},
|
||||
"Libm": {
|
||||
"hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=",
|
||||
"version": "2026"
|
||||
},
|
||||
"Libnotify": {
|
||||
"hash": "sha256-q0ns85I9Zwo5bZPN5JqjrJofY8/XLl+mbsRhyF1kx+o=",
|
||||
"version": "172.200.21"
|
||||
},
|
||||
"Librpcsvc": {
|
||||
"hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=",
|
||||
"version": "26"
|
||||
},
|
||||
"Libsystem": {
|
||||
"hash": "sha256-Lo4S7fsepuYlRtXGcVvNTAlx/soabjvKEUuiO09htNs=",
|
||||
"version": "1252.250.1"
|
||||
},
|
||||
"OpenDirectory": {
|
||||
"hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=",
|
||||
"version": "146"
|
||||
},
|
||||
"Security": {
|
||||
"hash": "sha256-uqSRU4Ft7+zMQ59FBS+Mu2JcWdbbuWP9/dFfo+Vkr5s=",
|
||||
"version": "58286.270.3.0.1"
|
||||
},
|
||||
"architecture": {
|
||||
"hash": "sha256-WGUNtFSBu9AuefHVEO3uB/JpKEGAgGFX/zRaaW4eYbI=",
|
||||
"version": "272.230.1"
|
||||
},
|
||||
"configd": {
|
||||
"hash": "sha256-Pg58INpZfdKXn1EPut2Kzghfjwxaz1Ex+u5KACA2O7g=",
|
||||
"version": "963.270.3"
|
||||
},
|
||||
"copyfile": {
|
||||
"hash": "sha256-gbxGQ8Wjt20++Bf+BkZT/R5dpsCnRo8+qUcerv5m7V8=",
|
||||
"version": "146.250.1"
|
||||
},
|
||||
"dtrace": {
|
||||
"hash": "sha256-ZbAaH2wmYlgLKtq0bpDoEInZiHMe5Bx84iUQC67ia0E=",
|
||||
"version": "284.250.4"
|
||||
},
|
||||
"dyld": {
|
||||
"hash": "sha256-5wtx+4pSAcNEwcE024XwIRorS3ZW/qmvfkY7UGe75ho=",
|
||||
"version": "655.1.1"
|
||||
},
|
||||
"eap8021x": {
|
||||
"hash": "sha256-9j+6Hw7w9wdLZxjdRwTACws2obg2/VCgl9ed4+Y4pPg=",
|
||||
"version": "264.250.6"
|
||||
},
|
||||
"hfs": {
|
||||
"hash": "sha256-/yf6z0VJkw2pPnVst2qgnSZfO6x9ot/cWT7Aewo3IZ4=",
|
||||
"version": "407.200.4"
|
||||
},
|
||||
"launchd": {
|
||||
"hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=",
|
||||
"version": "842.1.4"
|
||||
},
|
||||
"libclosure": {
|
||||
"hash": "sha256-NHK+yc7M/wc6Sbk24LDejNjBrbcWIg9zrYHlnPXC/Yc=",
|
||||
"version": "73"
|
||||
},
|
||||
"libdispatch": {
|
||||
"hash": "sha256-b0WqX3qX/qhUi2l63BrNvaVq167SuIgYGPid92MJ32U=",
|
||||
"version": "1008.270.1"
|
||||
},
|
||||
"libmalloc": {
|
||||
"hash": "sha256-1ZvO0LGV4AkDSdtwqfPFgCUbpAVzfKS0msa58tL2WLA=",
|
||||
"version": "166.251.2"
|
||||
},
|
||||
"libplatform": {
|
||||
"hash": "sha256-xQqCf+/DpHu/JMbmOpy6jl3np0H7/m1NKWZ21YWaerE=",
|
||||
"version": "177.270.1"
|
||||
},
|
||||
"libpthread": {
|
||||
"hash": "sha256-+AuYgLTM5RO3+MbxeE86rPh9WbiTiAl2gHZOAaQRkec=",
|
||||
"version": "330.250.2"
|
||||
},
|
||||
"mDNSResponder": {
|
||||
"hash": "sha256-SlrC3LIOndY1DVJ26bnuYQwpLhkV1PHAMJeaE3bMDI4=",
|
||||
"version": "878.270.2"
|
||||
},
|
||||
"objc4": {
|
||||
"hash": "sha256-rzDiOE//rUnRyCHM/XUQs9IImKGIFN/0D0IZ7SeGp2s=",
|
||||
"version": "756.2"
|
||||
},
|
||||
"ppp": {
|
||||
"hash": "sha256-a0zTwevtC+AAyLV/0+rX9VN5BXc2vaZGArz83VZtiWs=",
|
||||
"version": "847.200.5"
|
||||
},
|
||||
"removefile": {
|
||||
"hash": "sha256-23+ivRTPKId9Is5NAwYmVgN7TX2+7v9NONs9u7DrGH4=",
|
||||
"version": "45.200.2"
|
||||
},
|
||||
"xnu": {
|
||||
"hash": "sha256-ZRgj214Mmvvcji4OdzRjK/7Xtpz7r69SFmzSvtZNhNU=",
|
||||
"version": "4903.270.47"
|
||||
}
|
||||
},
|
||||
"10.15.6": {
|
||||
"CarbonHeaders": {
|
||||
"hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
|
||||
"version": "18.1"
|
||||
},
|
||||
"CommonCrypto": {
|
||||
"hash": "sha256-HKSRtTnJ6dH5j6Y+PRDQUcPyjwR70PEbRQu3hTM4G0A=",
|
||||
"version": "60165.120.1"
|
||||
},
|
||||
"IOAudioFamily": {
|
||||
"hash": "sha256-5lcK8nyjayLBw9j4PPVs8TWwOWcpggKkSXefVGl2rfA=",
|
||||
"version": "300.2"
|
||||
},
|
||||
"IOBDStorageFamily": {
|
||||
"hash": "sha256-aaS5jWPRX4be8d3Rigq+kXzi9Zwbr8dHcNgcIz0n66o=",
|
||||
"version": "19"
|
||||
},
|
||||
"IOCDStorageFamily": {
|
||||
"hash": "sha256-U6v+Gj+IumU8Aha5+uf3yOU0Z4KMuBh7aXnJqiZ/abY=",
|
||||
"version": "58"
|
||||
},
|
||||
"IODVDStorageFamily": {
|
||||
"hash": "sha256-JLp4xN0Rdb2VpuXtVTODYNqQthDEZk+g/lvHRwJHQB4=",
|
||||
"version": "42"
|
||||
},
|
||||
"IOFWDVComponents": {
|
||||
"hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=",
|
||||
"version": "208"
|
||||
},
|
||||
"IOFireWireAVC": {
|
||||
"hash": "sha256-7H3WcZC/HuS9xsTNDWRqt+1JzUNK4ndvd4u2ru0GGRE=",
|
||||
"version": "428"
|
||||
},
|
||||
"IOFireWireFamily": {
|
||||
"hash": "sha256-hLtd3d5qOsYdnGpMaTSipu9bOIYEHz2rKzNAoJai4dI=",
|
||||
"version": "475"
|
||||
},
|
||||
"IOFireWireSBP2": {
|
||||
"hash": "sha256-pHY6okHHotfFjdNsLwRjQX7dWGolBelpD7MEDz4lafY=",
|
||||
"version": "434"
|
||||
},
|
||||
"IOFireWireSerialBusProtocolTransport": {
|
||||
"hash": "sha256-Jb70fanuJTNV4IVoKMtMA66oVDR0I/h3JSIymhlKTQU=",
|
||||
"version": "257"
|
||||
},
|
||||
"IOGraphics": {
|
||||
"hash": "sha256-sKnJ0MOhT+dFfmMD2gqYmySufh0I9vBI/swjqoCbSHc=",
|
||||
"version": "576.1"
|
||||
},
|
||||
"IOHIDFamily": {
|
||||
"hash": "sha256-esiEGEiggFMR7rha6+dYaqiwGM+TlZtLBe8LF/PF0D8=",
|
||||
"version": "1446.140.2"
|
||||
},
|
||||
"IOKitUser": {
|
||||
"hash": "sha256-rB5zfJwoBPMpqW5PDM6ppWW07Y2AGS3f0UzXdfPGYYE=",
|
||||
"version": "1726.140.1"
|
||||
},
|
||||
"IONetworkingFamily": {
|
||||
"hash": "sha256-T+aDA++nubTHdPpfdAEm6077eJuzsQXHUDEbdlthVBQ=",
|
||||
"version": "139.140.2"
|
||||
},
|
||||
"IOSerialFamily": {
|
||||
"hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=",
|
||||
"version": "93"
|
||||
},
|
||||
"IOStorageFamily": {
|
||||
"hash": "sha256-vyIN7oru2PN7C4a6RBJomlYs4NaYzmCTBEuWiSXG41M=",
|
||||
"version": "238.120.1"
|
||||
},
|
||||
"IOUSBFamily": {
|
||||
"hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=",
|
||||
"version": "630.4.5"
|
||||
},
|
||||
"Libc": {
|
||||
"hash": "sha256-FAifkHs2Kls2ym9/M56o4u2UZfdTKCnqxRbTXOIHyz8=",
|
||||
"version": "1353.100.2"
|
||||
},
|
||||
"Libinfo": {
|
||||
"hash": "sha256-syTH8dhWkSPgqRG7p528L7Xx1+ymmqHrCyhUykGhK9s=",
|
||||
"version": "538"
|
||||
},
|
||||
"Libm": {
|
||||
"hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=",
|
||||
"version": "2026"
|
||||
},
|
||||
"Libnotify": {
|
||||
"hash": "sha256-7o4GNZde3MkCks2NJdNIXvvtMAOqGEA05M7S8o7j0XQ=",
|
||||
"version": "241.100.2"
|
||||
},
|
||||
"Librpcsvc": {
|
||||
"hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=",
|
||||
"version": "26"
|
||||
},
|
||||
"Libsystem": {
|
||||
"hash": "sha256-RNkaoaRl6akbrgjagLd+ncZ2EAdjegIdy7Z/MINoTpc=",
|
||||
"version": "1281.100.1"
|
||||
},
|
||||
"OpenDirectory": {
|
||||
"hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=",
|
||||
"version": "146"
|
||||
},
|
||||
"Security": {
|
||||
"hash": "sha256-dlNTEVkgTl3po7ty2wjatGTANBwegpZxBX1ByneqKRU=",
|
||||
"version": "59306.140.5"
|
||||
},
|
||||
"architecture": {
|
||||
"hash": "sha256-pIX9pEXE1Xjll9qwiWrMRwqw6G4g0isto/ALHsmkUSc=",
|
||||
"version": "279"
|
||||
},
|
||||
"configd": {
|
||||
"hash": "sha256-nKFDfyH1gQtFyda6HBq3E7Tp5EI4O5n/9GYQEFhMIdE=",
|
||||
"version": "1061.141.1"
|
||||
},
|
||||
"copyfile": {
|
||||
"hash": "sha256-nEfD/KUk7e32tw9buQYrsy/BAdAfgE9IObdV4nCm37M=",
|
||||
"version": "166.40.1"
|
||||
},
|
||||
"dtrace": {
|
||||
"hash": "sha256-dgJ7om5efUQyc9tP6cBeSpahORqV5bzEDcxcVu4TaDg=",
|
||||
"version": "338.100.1"
|
||||
},
|
||||
"dyld": {
|
||||
"hash": "sha256-YkFazM/cviJMwPVXHXP2irfgHtOueI2RNrMedWvkH0A=",
|
||||
"version": "750.6"
|
||||
},
|
||||
"eap8021x": {
|
||||
"hash": "sha256-/FsmD4mk/kwsocK8x8Gsk3yOBW3pZLcGHxnNcogqjhY=",
|
||||
"version": "292.40.2"
|
||||
},
|
||||
"hfs": {
|
||||
"hash": "sha256-vNo2Wd0n6tjG+xtA3OrwB/TOXvLxaLehEY/l9ZBS5Sw=",
|
||||
"version": "522.100.5"
|
||||
},
|
||||
"launchd": {
|
||||
"hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=",
|
||||
"version": "842.1.4"
|
||||
},
|
||||
"libclosure": {
|
||||
"hash": "sha256-A3QTD6bqUy8ahH/XlMuidYNvT92ufeVpwPsZh4ZzQdk=",
|
||||
"version": "74"
|
||||
},
|
||||
"libdispatch": {
|
||||
"hash": "sha256-gd56s0C2dKbZoaGNXt3LBfXaEl5A744djFq3G9uoWws=",
|
||||
"version": "1173.100.2"
|
||||
},
|
||||
"libmalloc": {
|
||||
"hash": "sha256-1VhkXY8m6vVQ4aaxICtHVQtXDHNV2CsY9UUst0AioMY=",
|
||||
"version": "283.100.6"
|
||||
},
|
||||
"libplatform": {
|
||||
"hash": "sha256-Z4Lj9efT1bt6HMAMQvgMc33QdYzrBvieBjmw4W6H9YI=",
|
||||
"version": "220.100.1"
|
||||
},
|
||||
"libpthread": {
|
||||
"hash": "sha256-ZHxqq1qVRXPL0psAX+5bcuA5D/FjJnIcm+ctTkTGBJA=",
|
||||
"version": "416.100.3"
|
||||
},
|
||||
"mDNSResponder": {
|
||||
"hash": "sha256-CV3GBeO4Ly8/PbZ7Fq55diRzB00VsB2uTvjGo/tqf10=",
|
||||
"version": "1096.100.3"
|
||||
},
|
||||
"objc4": {
|
||||
"hash": "sha256-AJwPTnjJMBbSFDppvKyx92RdfmbmwQOvPnU0E0mU+jU=",
|
||||
"version": "787.1"
|
||||
},
|
||||
"ppp": {
|
||||
"hash": "sha256-DNmDigQqDKR1ghcn6GaKeDldp6thH2C6+uZKjC3EfkU=",
|
||||
"version": "862.140.2"
|
||||
},
|
||||
"removefile": {
|
||||
"hash": "sha256-bkxiq7OEFtEFPwSBi4OxmpRyKWYgeMhnokFfS7RPUnU=",
|
||||
"version": "48"
|
||||
},
|
||||
"xnu": {
|
||||
"hash": "sha256-Y/DTtpnT8JQZO5Ijr+tW0IrIOuECcJ+ZvFLCgwrFt2M=",
|
||||
"version": "6153.141.1"
|
||||
}
|
||||
},
|
||||
"11.3": {
|
||||
"CarbonHeaders": {
|
||||
"hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
|
||||
|
||||
@@ -1,24 +1,4 @@
|
||||
{
|
||||
"10.12": {
|
||||
"url": "http://swcdn.apple.com/content/downloads/22/62/041-88607/wg8avdk0jo75k9a13gentz9stwqgrqmcv6/CLTools_SDK_OSX1012.pkg",
|
||||
"version": "10.12.2",
|
||||
"hash": "sha256-Jf2WIB9bY/rPwe0AOW3YWJY/6EqVe41yhezdTGOO3M8="
|
||||
},
|
||||
"10.13": {
|
||||
"url": "http://swcdn.apple.com/content/downloads/33/36/041-90419-A_7JJ4H9ZHO2/xs88ob5wjz6riz7g6764twblnvksusg4ps/CLTools_SDK_macOS1013.pkg",
|
||||
"version": "10.13.2",
|
||||
"hash": "sha256-8nd55fiJLfRWABAbMaHXjp6i20RqupmKedwmhb3S0/A="
|
||||
},
|
||||
"10.14": {
|
||||
"url": "http://swcdn.apple.com/content/downloads/41/57/061-26573-A_JMOA8GZGDR/lj8yrtu8dgs40fw9k8f5fkoviwkp0og6vs/CLTools_SDK_macOS1014.pkg",
|
||||
"version": "10.14.6",
|
||||
"hash": "sha256-NMNkycIl3AVZCw0ZpHNkaeYVS9LAZVSddHw5loL9dhk="
|
||||
},
|
||||
"10.15": {
|
||||
"url": "https://swcdn.apple.com/content/downloads/50/51/071-29699-A_YC8SX0OHH3/7479xojqghsvgtnt3dxjpnxuz9sjpmbmds/CLTools_macOSLMOS_SDK.pkg",
|
||||
"version": "10.15.6",
|
||||
"hash": "sha256-mPJQC+v4yNiOCKLQfhidB2WH2MMclSCP1odvOoGdVPw="
|
||||
},
|
||||
"11": {
|
||||
"url": "https://swcdn.apple.com/content/downloads/02/62/071-54303-A_EU2CL1YVT7/943i95dpeyi2ghlnj2mgyq3t202t5gf18b/CLTools_macOSNMOS_SDK.pkg",
|
||||
"version": "11.3",
|
||||
|
||||
@@ -9,12 +9,8 @@ in
|
||||
substitute,
|
||||
|
||||
# Specifies the major version used for the SDK. Uses `hostPlatform.darwinSdkVersion` by default.
|
||||
darwinSdkMajorVersion ? (
|
||||
if lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11" then
|
||||
lib.versions.majorMinor stdenv.hostPlatform.darwinSdkVersion
|
||||
else
|
||||
lib.versions.major stdenv.hostPlatform.darwinSdkVersion
|
||||
),
|
||||
darwinSdkMajorVersion ? lib.versions.major stdenv.hostPlatform.darwinSdkVersion,
|
||||
|
||||
# Enabling bootstrap disables propagation. Defaults to `false` (meaning to propagate certain packages and `xcrun`)
|
||||
# except in stage0 of the Darwin stdenv bootstrap.
|
||||
enableBootstrap ? stdenv.name == "bootstrap-stage0-stdenv-darwin",
|
||||
@@ -48,11 +44,6 @@ let
|
||||
(callPackage ./common/propagate-inputs.nix { })
|
||||
(callPackage ./common/propagate-xcrun.nix { })
|
||||
]
|
||||
# Older SDKs do not include the libraries re-exported from umbrella frameworks in the umbrellas’ stubs, which causes
|
||||
# link failures for those libraries unless their paths have been rewritten to point to the store.
|
||||
++ lib.optionals (lib.versionOlder sdkVersion "11.0") [
|
||||
(callPackage ./common/rewrite-sdk-paths.nix { inherit sdkVersion; })
|
||||
]
|
||||
# This has to happen last.
|
||||
++ [
|
||||
(callPackage ./common/run-build-phase-hooks.nix { })
|
||||
@@ -97,9 +88,7 @@ stdenvNoCC.mkDerivation (
|
||||
mkdir -p "$sdkpath"
|
||||
|
||||
cp -rd . "$sdkpath/${sdkName}"
|
||||
${lib.optionalString (lib.versionAtLeast finalAttrs.version "11.0") ''
|
||||
ln -s "${sdkName}" "$sdkpath/MacOSX${sdkMajor}.sdk"
|
||||
''}
|
||||
ln -s "${sdkName}" "$sdkpath/MacOSX${sdkMajor}.sdk"
|
||||
ln -s "${sdkName}" "$sdkpath/MacOSX.sdk"
|
||||
|
||||
runHook postInstall
|
||||
@@ -116,9 +105,7 @@ stdenvNoCC.mkDerivation (
|
||||
homepage = "https://developer.apple.com";
|
||||
maintainers = lib.teams.darwin.members;
|
||||
platforms = lib.platforms.darwin;
|
||||
badPlatforms =
|
||||
lib.optionals (lib.versionAtLeast sdkVersion "10.15") [ lib.systems.inspect.patterns.is32bit ]
|
||||
++ lib.optionals (lib.versionOlder sdkVersion "11.0") [ lib.systems.inspect.patterns.isAarch ];
|
||||
badPlatforms = [ lib.systems.inspect.patterns.is32bit ];
|
||||
};
|
||||
})
|
||||
)
|
||||
|
||||
@@ -51,7 +51,7 @@ gcc10Stdenv.mkDerivation rec {
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
postPatch = ''
|
||||
sed -ie 's!/bin/echo!echo!' 3rdParty/V8/gypfiles/*.gypi
|
||||
sed -i -e 's!/bin/echo!echo!' 3rdParty/V8/gypfiles/*.gypi
|
||||
|
||||
# with nixpkgs, it has no sense to check for a version update
|
||||
substituteInPlace js/client/client.js --replace "require('@arangodb').checkAvailableVersions();" ""
|
||||
|
||||
@@ -1,50 +1,51 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, bash
|
||||
, buildPackages
|
||||
, linuxHeaders
|
||||
, python3
|
||||
, swig
|
||||
, pkgsCross
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
autoreconfHook,
|
||||
bash,
|
||||
buildPackages,
|
||||
linuxHeaders,
|
||||
python3,
|
||||
swig,
|
||||
pkgsCross,
|
||||
|
||||
# Enabling python support while cross compiling would be possible, but the
|
||||
# configure script tries executing python to gather info instead of relying on
|
||||
# python3-config exclusively
|
||||
, enablePython ? stdenv.hostPlatform == stdenv.buildPlatform,
|
||||
# Enabling python support while cross compiling would be possible, but the
|
||||
# configure script tries executing python to gather info instead of relying on
|
||||
# python3-config exclusively
|
||||
enablePython ? stdenv.hostPlatform == stdenv.buildPlatform,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "audit";
|
||||
version = "4.0";
|
||||
version = "4.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://people.redhat.com/sgrubb/audit/audit-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-v0ItQSard6kqTDrDneVHPyeNw941ck0lGKSMe+FdVNg=";
|
||||
hash = "sha256-1dG11Q7kotDReHW8aua9an1bNNlVfqhHo5+uxTH6qgo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "musl.patch";
|
||||
url = "https://github.com/linux-audit/audit-userspace/commit/64cb48e1e5137b8a389c7528e611617a98389bc7.patch";
|
||||
hash = "sha256-DN2F5w+2Llm80FZntH9dvdyT00pVBSgRu8DDFILyrlU=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "musl.patch";
|
||||
url = "https://github.com/linux-audit/audit-userspace/commit/4192eb960388458c85d76e5e385cfeef48f02c79.patch";
|
||||
hash = "sha256-G6CJ9nBJSsTyJ0qq14PVo+YdInAvLLQtXcR25Q8V5/4=";
|
||||
name = "static.patch";
|
||||
url = "https://github.com/linux-audit/audit-userspace/commit/a89664b45c30a853a6f80b19730984bd78432142.patch";
|
||||
hash = "sha256-HsaL9Bfo1MQ1JBKIS9ckNTapGk5eshjWWKh4M+e+Y9c=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace bindings/swig/src/auditswig.i \
|
||||
--replace "/usr/include/linux/audit.h" \
|
||||
"${linuxHeaders}/include/linux/audit.h"
|
||||
--replace-fail "/usr/include/linux/audit.h" \
|
||||
"${linuxHeaders}/include/linux/audit.h"
|
||||
'';
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" ];
|
||||
outputs = [
|
||||
"bin"
|
||||
"lib"
|
||||
"dev"
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -52,13 +53,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildPackages.stdenv.cc
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
]
|
||||
++ lib.optionals enablePython [
|
||||
python3
|
||||
swig
|
||||
];
|
||||
nativeBuildInputs =
|
||||
[
|
||||
autoreconfHook
|
||||
]
|
||||
++ lib.optionals enablePython [
|
||||
python3
|
||||
swig
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bash
|
||||
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch";
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch?id=dec60bb6900d6ebdaaa6aa1dcb845b30b739f9b5";
|
||||
sha256 = "1bfcr5sps0ip9gl4jprji5jgf9wkczz6d2clsjjlbsy8r3ixi3lv";
|
||||
})
|
||||
];
|
||||
|
||||
@@ -14,13 +14,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-auth";
|
||||
version = "0.7.26";
|
||||
# nixpkgs-update: no auto update
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-auth";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-02dy2xgMGWkLf+HyBztbkCcazfZNAMwpJPU2gGBPokY=";
|
||||
hash = "sha256-wVHTfiAejAra8LnytxSJijUXHDmEwAj5D+wXOKq32B4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-common";
|
||||
version = "0.9.27";
|
||||
# nixpkgs-update: no auto update
|
||||
version = "0.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VbF+R2LB5M2luOoQ/HsAOqk/ujHSW4QJC0OTzNnu9PM=";
|
||||
hash = "sha256-sA6CsLLHh4Ce/+ffl4OhisMSgdrD+EmXvTNGSq7/vvk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@@ -32,8 +33,6 @@ stdenv.mkDerivation rec {
|
||||
preCheck = let
|
||||
ignoreTests = [
|
||||
"promise_test_multiple_waiters"
|
||||
] ++ lib.optionals stdenv.hostPlatform.isMusl [
|
||||
"sba_metrics" # https://github.com/awslabs/aws-c-common/issues/839
|
||||
];
|
||||
in ''
|
||||
cat <<EOW >CTestCustom.cmake
|
||||
|
||||
@@ -7,13 +7,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-compression";
|
||||
version = "0.2.19";
|
||||
# nixpkgs-update: no auto update
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-compression";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Zr1C47YaTkMlG7r2WtAkxRfjZRuBKeTXzNIGspdLap4=";
|
||||
sha256 = "sha256-EjvOf2UMju6pycPdYckVxqQ34VOhrIIyvK+O3AVRED4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,13 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-event-stream";
|
||||
version = "0.4.3";
|
||||
# nixpkgs-update: no auto update
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xLgPFy+wFtUe3GawICrAHyji+mkfxC2jw7lsL+p7pl4=";
|
||||
hash = "sha256-lg1qS/u5Fi8nt/tv2ekd8dgQ7rlrF3DrRxqidAoEywY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -11,13 +11,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-http";
|
||||
version = "0.8.2";
|
||||
# nixpkgs-update: no auto update
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-http";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-86auAZGoaYIpoTVlB9uC+nKMNt1QRNor+/68B5D36r8=";
|
||||
hash = "sha256-3nT64dFUcuwPfhQDwY5MTe/xPdr7XZMBpVL7V0y9tng=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,13 +13,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-mqtt";
|
||||
version = "0.10.5";
|
||||
# nixpkgs-update: no auto update
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-mqtt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PByF0P+4gwSQKk7qHc79p025TbWZ0QeFXqO2GOtuaII=";
|
||||
hash = "sha256-gIoC3OG6VFzNH9/DjuC42eCIuN+w1AikaGAbx6ao8qQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,13 +14,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-s3";
|
||||
version = "0.6.0";
|
||||
# nixpkgs-update: no auto update
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-s3";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qPVITirqhExIeayh6AWEyAXPlkUtk7gkIcmT/IpNisw=";
|
||||
hash = "sha256-UE42U3UszobaUdo0ry9IlwTbSbGqmYkux19ILrVgUZY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-sdkutils";
|
||||
version = "0.1.16";
|
||||
# nixpkgs-update: no auto update
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-sdkutils";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ih7U2uP5FrBx6or1Rp/k+HWDE6evEZyNM//wsPxH9Qo=";
|
||||
hash = "sha256-Z9c+uBiGMXW5v+khdNaElhno16ikBO4voTzwd2mP6rA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,13 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-checksums";
|
||||
version = "0.1.18";
|
||||
# nixpkgs-update: no auto update
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EhIVa8/IK4evGt4vYECunLpxrCMSOsr1RZ/8hFbRi9M=";
|
||||
sha256 = "sha256-hiqV6FrOZ19YIxL3UKBuexLJwoC2mY7lqysnV7ze0gg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -1,15 +1,17 @@
|
||||
From fd3f3a28e7fce7fe4e10ed2d7edc4bfda8ab27df Mon Sep 17 00:00:00 2001
|
||||
From b3a46b9a2a9f86ff416a0ff5f84882c0dedebd14 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Tojnar <jtojnar@gmail.com>
|
||||
Date: Sun, 9 Jan 2022 01:57:18 +0100
|
||||
Subject: [PATCH] build: Make includedir properly overrideable
|
||||
|
||||
This is required by some package managers like Nix.
|
||||
|
||||
Co-authored-by: Artturin <Artturin@artturin.com>
|
||||
---
|
||||
CMakeLists.txt | 22 +++++++++++++---------
|
||||
1 file changed, 13 insertions(+), 9 deletions(-)
|
||||
CMakeLists.txt | 26 +++++++++++++++-----------
|
||||
1 file changed, 15 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ec6d172..6514c23 100644
|
||||
index 9f062ca..b28f13c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -49,6 +49,10 @@ if(${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
|
||||
@@ -23,7 +25,7 @@ index ec6d172..6514c23 100644
|
||||
if(NOT CMAKE_CXX_STANDARD)
|
||||
set(CMAKE_CXX_STANDARD 11)
|
||||
endif()
|
||||
@@ -307,7 +311,7 @@ endif()
|
||||
@@ -329,7 +333,7 @@ endif()
|
||||
target_include_directories(${PROJECT_NAME} PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
||||
$<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}>
|
||||
@@ -32,28 +34,32 @@ index ec6d172..6514c23 100644
|
||||
|
||||
aws_use_package(aws-c-http)
|
||||
aws_use_package(aws-c-mqtt)
|
||||
@@ -324,14 +328,14 @@ aws_add_sanitizers(${PROJECT_NAME})
|
||||
@@ -346,16 +350,16 @@ aws_add_sanitizers(${PROJECT_NAME})
|
||||
|
||||
target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS})
|
||||
|
||||
-install(FILES ${AWS_CRT_HEADERS} DESTINATION "include/aws/crt" COMPONENT Development)
|
||||
-install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "include/aws/crt/auth" COMPONENT Development)
|
||||
-install(FILES ${AWS_CRT_CHECKSUM_HEADERS} DESTINATION "include/aws/crt/checksum" COMPONENT Development)
|
||||
-install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "include/aws/crt/crypto" COMPONENT Development)
|
||||
-install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "include/aws/crt/io" COMPONENT Development)
|
||||
-install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "include/aws/iot" COMPONENT Development)
|
||||
-install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "include/aws/crt/mqtt" COMPONENT Development)
|
||||
-install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "include/aws/crt/http" COMPONENT Development)
|
||||
-install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "include/aws/crt/endpoints" COMPONENT Development)
|
||||
-install(FILES ${AWS_CRT_CBOR_HEADERS} DESTINATION "include/aws/crt/cbor" COMPONENT Development)
|
||||
+install(FILES ${AWS_CRT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt" COMPONENT Development)
|
||||
+install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/auth" COMPONENT Development)
|
||||
+install(FILES ${AWS_CRT_CHECKSUM_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/checksum" COMPONENT Development)
|
||||
+install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/crypto" COMPONENT Development)
|
||||
+install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/io" COMPONENT Development)
|
||||
+install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/iot" COMPONENT Development)
|
||||
+install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/mqtt" COMPONENT Development)
|
||||
+install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/http" COMPONENT Development)
|
||||
+install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/endpoints" COMPONENT Development)
|
||||
+install(FILES ${AWS_CRT_CBOR_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/cbor" COMPONENT Development)
|
||||
|
||||
install(
|
||||
TARGETS ${PROJECT_NAME}
|
||||
--
|
||||
2.42.0
|
||||
2.46.0
|
||||
|
||||
@@ -17,7 +17,8 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-crt-cpp";
|
||||
version = "0.26.12";
|
||||
# nixpkgs-update: no auto update
|
||||
version = "0.29.4";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "awslabs";
|
||||
repo = "aws-crt-cpp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mVihmcl24gFLnF3A/qLSvr2npOotMlBH7TqU5vOwI9g=";
|
||||
sha256 = "sha256-Uv1BHM39f9soq7kziedqRhHqQ/xwnqcz++1UM5nuo8g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bash-completion";
|
||||
version = "2.14.0";
|
||||
version = "2.15.0";
|
||||
|
||||
# Using fetchurl because fetchGithub or fetchzip will have trouble on
|
||||
# e.g. APFS filesystems (macOS) because of non UTF-8 characters in some of the
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
# See discussion in https://github.com/NixOS/nixpkgs/issues/107768
|
||||
src = fetchurl {
|
||||
url = "https://github.com/scop/bash-completion/releases/download/${version}/bash-completion-${version}.tar.xz";
|
||||
sha256 = "sha256-XHSU+WgoCDLWrbWqGfdFpW8aed8xHlkzjF76b3KF4Wg=";
|
||||
sha256 = "sha256-l2pi7mImlwKDzahey5x6Soj2JXTApvnoVhJpdt7PGgY=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
preCheck = ''
|
||||
patchShebangs misc/
|
||||
patchShebangs test/
|
||||
sed -ie 's|/bin/bash|${bash}/bin/bash|' test/test.pl
|
||||
sed -i -e 's|/bin/bash|${bash}/bin/bash|' test/test.pl
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# /usr/bin/env is used in test commands and embedded scripts.
|
||||
find test -name '*.sh' \
|
||||
-exec sed -ie 's|/usr/bin/env|${coreutils}/bin/env|g' {} +
|
||||
-exec sed -i -e 's|/usr/bin/env|${coreutils}/bin/env|g' {} +
|
||||
'';
|
||||
|
||||
# Functional tests use loopback networking.
|
||||
|
||||
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches =
|
||||
[ (fetchurl {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-misc/bfr/files/bfr-1.6-perl.patch";
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-misc/bfr/files/bfr-1.6-perl.patch?id=dec60bb6900d6ebdaaa6aa1dcb845b30b739f9b5";
|
||||
sha256 = "1pk9jm3c1qzs727lh0bw61w3qbykaqg4jblywf9pvq5bypk88qfj";
|
||||
})
|
||||
];
|
||||
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/bitmeter/files/bitmeter-1.2-fix-build-system.patch";
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/bitmeter/files/bitmeter-1.2-fix-build-system.patch?id=dec60bb6900d6ebdaaa6aa1dcb845b30b739f9b5";
|
||||
sha256 = "021mz6933iw7mpk6b9cbjr8naj6smbq1hwqjszlyx72qbwrrid7k";
|
||||
})
|
||||
];
|
||||
|
||||
@@ -20,32 +20,25 @@
|
||||
, gobject-introspection
|
||||
, buildPackages
|
||||
, installTests ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bluez";
|
||||
version = "5.78";
|
||||
version = "5.79";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/bluetooth/bluez-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-gw/tGRXF03W43g9eb0X83qDcxf9f+z0x227Q8A1zxeM=";
|
||||
hash = "sha256-QWSlMDqfcccPSMA/9gvjQjG1aNk6mtXnmSjTTmqg6oo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream fix is wrong:
|
||||
# https://github.com/bluez/bluez/issues/843#issuecomment-2352696535
|
||||
(fetchurl {
|
||||
name = "basename.patch";
|
||||
url = "https://github.com/void-linux/void-packages/raw/187b45d47d93b6857a95cae10c2132d76e4955fc/srcpkgs/bluez/patches/basename.patch";
|
||||
hash = "sha256-Jb4u7rxIShDp1yUgaQVDJo2HJfZBzRoVlcDEWxooFgk=";
|
||||
(fetchpatch {
|
||||
name = "musl.patch";
|
||||
url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=9d69dba21f1e46b34cdd8ae27fec11d0803907ee";
|
||||
hash = "sha256-yMXPRPK8aT+luVoXNxx9zIa4c6E0BKYKS55DCfr8EQ0=";
|
||||
})
|
||||
] ++ lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64)
|
||||
# Disable one failing test with musl libc, also seen by alpine
|
||||
# https://github.com/bluez/bluez/issues/726
|
||||
(fetchurl {
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/bluez/disable_aics_unit_testcases.patch?id=8e96f7faf01a45f0ad8449c1cd825db63a8dfd48";
|
||||
hash = "sha256-1PJkipqBO3qxxOqRFQKfpWlne1kzTCgtnTFYI1cFQt4=";
|
||||
});
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
@@ -168,6 +161,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.bluez.org/";
|
||||
description = "Official Linux Bluetooth protocol stack";
|
||||
|
||||
@@ -52,20 +52,20 @@ stdenv.mkDerivation rec {
|
||||
(
|
||||
cd $sourceRoot
|
||||
tar -xf Sources/cnrdrvcups-lb-${version}-1.${suffix2}.tar.xz
|
||||
sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-common-${version}/allgen.sh
|
||||
sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-common-${version}/allgen.sh
|
||||
sed -ie "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-common-${version}/allgen.sh
|
||||
sed -ie "s@/usr@$out@" cnrdrvcups-common-${version}/{{backend,rasterfilter}/Makefile.am,rasterfilter/cnrasterproc.h}
|
||||
sed -ie "s@etc/cngplp@$out/etc/cngplp@" cnrdrvcups-common-${version}/cngplp/Makefile.am
|
||||
sed -ie "s@usr/share/cngplp@$out/usr/share/cngplp@" cnrdrvcups-common-${version}/cngplp/src/Makefile.am
|
||||
sed -i -e "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-common-${version}/allgen.sh
|
||||
sed -i -e "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-common-${version}/allgen.sh
|
||||
sed -i -e "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-common-${version}/allgen.sh
|
||||
sed -i -e "s@/usr@$out@" cnrdrvcups-common-${version}/{{backend,rasterfilter}/Makefile.am,rasterfilter/cnrasterproc.h}
|
||||
sed -i -e "s@etc/cngplp@$out/etc/cngplp@" cnrdrvcups-common-${version}/cngplp/Makefile.am
|
||||
sed -i -e "s@usr/share/cngplp@$out/usr/share/cngplp@" cnrdrvcups-common-${version}/cngplp/src/Makefile.am
|
||||
patchShebangs cnrdrvcups-common-${version}
|
||||
|
||||
sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-lb-${version}/allgen.sh
|
||||
sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-lb-${version}/allgen.sh
|
||||
sed -ie "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-lb-${version}/allgen.sh
|
||||
sed -ie '/^cd \.\.\/cngplp/,/^cd files/{/^cd files/!{d}}' cnrdrvcups-lb-${version}/allgen.sh
|
||||
sed -ie "s@cd \.\./pdftocpca@cd pdftocpca@" cnrdrvcups-lb-${version}/allgen.sh
|
||||
sed -ie "s@/usr@$out@" cnrdrvcups-lb-${version}/pdftocpca/Makefile.am
|
||||
sed -i -e "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-lb-${version}/allgen.sh
|
||||
sed -i -e "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-lb-${version}/allgen.sh
|
||||
sed -i -e "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-lb-${version}/allgen.sh
|
||||
sed -i -e '/^cd \.\.\/cngplp/,/^cd files/{/^cd files/!{d}}' cnrdrvcups-lb-${version}/allgen.sh
|
||||
sed -i -e "s@cd \.\./pdftocpca@cd pdftocpca@" cnrdrvcups-lb-${version}/allgen.sh
|
||||
sed -i -e "s@/usr@$out@" cnrdrvcups-lb-${version}/pdftocpca/Makefile.am
|
||||
sed -i "/CNGPLPDIR/d" cnrdrvcups-lb-${version}/Makefile
|
||||
patchShebangs cnrdrvcups-lb-${version}
|
||||
)
|
||||
|
||||
@@ -11,13 +11,9 @@
|
||||
makeWrapper,
|
||||
perl,
|
||||
substituteAll,
|
||||
substitute,
|
||||
cudd,
|
||||
fetchurl,
|
||||
nix-update-script,
|
||||
apple-sdk,
|
||||
apple-sdk_10_15,
|
||||
darwinMinVersionHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -51,14 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[ cadical ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
(darwinMinVersionHook "10.15")
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder apple-sdk.version "10.15") [
|
||||
apple-sdk_10_15
|
||||
];
|
||||
buildInputs = [ cadical ];
|
||||
|
||||
# do not download sources
|
||||
# link existing cadical instead
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
From 989ba5e30cefa0dd8990da158661713c4a21c0fe Mon Sep 17 00:00:00 2001
|
||||
From: Randy Eckenrode <randy@largeandhighquality.com>
|
||||
Date: Thu, 11 Apr 2024 18:05:34 -0400
|
||||
Subject: [PATCH 3/6] Fix utimensat compatability with the 10.12 SDK
|
||||
|
||||
---
|
||||
include/compat.h | 3 +++
|
||||
libstuff/writeout.c | 2 +-
|
||||
misc/lipo.c | 2 +-
|
||||
3 files changed, 5 insertions(+), 2 deletions(-)
|
||||
create mode 100644 include/compat.h
|
||||
|
||||
diff --git a/include/compat.h b/include/compat.h
|
||||
new file mode 100644
|
||||
index 0000000..8b1b866
|
||||
--- /dev/null
|
||||
+++ b/include/compat.h
|
||||
@@ -0,0 +1,3 @@
|
||||
+#pragma once
|
||||
+#include <time.h>
|
||||
+extern int utimensat(int dirfd, const char* pathname, const struct timespec times[_Nullable 2], int flags);
|
||||
diff --git a/libstuff/writeout.c b/libstuff/writeout.c
|
||||
index f904caa..03fa535 100644
|
||||
--- a/libstuff/writeout.c
|
||||
+++ b/libstuff/writeout.c
|
||||
@@ -297,7 +297,7 @@ no_throttle:
|
||||
* have been zeroed out when the library was created. writeout
|
||||
* will not zero out the modification time in the filesystem.
|
||||
*/
|
||||
- if (__builtin_available(macOS 10.12, *)) {
|
||||
+ if (__builtin_available(macOS 10.13, *)) {
|
||||
struct timespec times[2] = {0};
|
||||
memcpy(×[0], &toc_timespec, sizeof(struct timespec));
|
||||
memcpy(×[1], &toc_timespec, sizeof(struct timespec));
|
||||
diff --git a/misc/lipo.c b/misc/lipo.c
|
||||
index 04a3eca..887c049 100644
|
||||
--- a/misc/lipo.c
|
||||
+++ b/misc/lipo.c
|
||||
@@ -607,7 +607,7 @@ unknown_flag:
|
||||
if(close(fd) == -1)
|
||||
system_fatal("can't close output file: %s",output_file);
|
||||
#ifndef __OPENSTEP__
|
||||
- if (__builtin_available(macOS 10.12, *)) {
|
||||
+ if (__builtin_available(macOS 10.13, *)) {
|
||||
time_result = utimensat(AT_FDCWD, output_file,
|
||||
output_times, 0);
|
||||
}
|
||||
--
|
||||
2.45.2
|
||||
|
||||
@@ -28,26 +28,11 @@ target_prefix = get_option('target_prefix')
|
||||
# Dependencies
|
||||
cc = meson.get_compiler('c')
|
||||
|
||||
libcxx = cc.find_library('c++')
|
||||
libcodedirectory = cc.find_library('codedirectory')
|
||||
libprunetrie = cc.find_library('prunetrie')
|
||||
|
||||
|
||||
# Feature tests
|
||||
# Add compatibility header for Darwin SDKs that don’t define `utimensat`.
|
||||
utimensat_test = '''
|
||||
#include <fcntl.h>
|
||||
#include <sys/stat.h>
|
||||
int main(int argc, char* argv[]) {
|
||||
utimensat(AT_FDCWD, NULL, NULL, 0);
|
||||
return 0;
|
||||
}
|
||||
'''
|
||||
if host_machine.system() == 'darwin' and not cc.compiles(utimensat_test, name : 'supports utimensat')
|
||||
add_project_arguments('-include', 'compat.h', language : 'c')
|
||||
add_project_link_arguments('-undefined', 'dynamic_lookup', language : 'c')
|
||||
endif
|
||||
|
||||
|
||||
incdirs = include_directories('include')
|
||||
|
||||
# Static libraries
|
||||
@@ -454,6 +439,7 @@ install_man('man/nmedit.1')
|
||||
otool = executable(
|
||||
f'@target_prefix@otool',
|
||||
c_args : ['-DEFI_SUPPORT'],
|
||||
dependencies : [libcxx],
|
||||
include_directories : incdirs,
|
||||
install : true,
|
||||
link_with : [libstuff],
|
||||
@@ -553,7 +539,7 @@ install_man('man/strings.1')
|
||||
strip = executable(
|
||||
f'@target_prefix@strip',
|
||||
c_args : ['-DTRIE_SUPPORT'],
|
||||
dependencies : [libcodedirectory, libprunetrie],
|
||||
dependencies : [libcxx, libcodedirectory, libprunetrie],
|
||||
include_directories : incdirs,
|
||||
install : true,
|
||||
link_with : [libstuff],
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
buildPackages,
|
||||
ld64,
|
||||
llvm,
|
||||
memstreamHook,
|
||||
meson,
|
||||
ninja,
|
||||
openssl,
|
||||
@@ -73,9 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./0001-Fix-build-issues-with-misc-redo_prebinding.c.patch
|
||||
# Use libcd_is_blob_a_linker_signature as defined in the libcodedirectory.h header
|
||||
./0002-Rely-on-libcd_is_blob_a_linker_signature.patch
|
||||
# cctools uses availability checks for `utimensat`, but it checks the wrong version.
|
||||
# Also, provide a definition to avoid implicit function definition errors.
|
||||
./0003-Fix-utimensat-compatability-with-the-10.12-SDK.patch
|
||||
# Use the nixpkgs clang’s path as the prefix.
|
||||
./0004-Use-nixpkgs-clang-with-the-assembler-driver.patch
|
||||
# Make sure cctools can find ld64 in the store
|
||||
@@ -102,9 +98,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace misc/libtool.c \
|
||||
--subst-var-by targetPrefix '${targetPrefix}'
|
||||
|
||||
# The version of this file distributed with cctools defines several CPU types missing from the 10.12 SDK.
|
||||
ln -s machine-cctools.h include/mach/machine.h
|
||||
|
||||
# Use libxar from nixpkgs
|
||||
for cctool_src in misc/nm.c otool/print_bitcode.c; do
|
||||
substituteInPlace $cctool_src \
|
||||
@@ -130,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
ld64
|
||||
llvm
|
||||
] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ memstreamHook ];
|
||||
];
|
||||
|
||||
mesonBuildType = "release";
|
||||
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- a/genisoimage/genisoimage.h
|
||||
+++ b/genisoimage/genisoimage.h
|
||||
@@ -377,7 +377,7 @@ extern int use_fileversion;
|
||||
extern int split_SL_component;
|
||||
extern int split_SL_field;
|
||||
extern char *trans_tbl;
|
||||
-char *outfile;
|
||||
+extern char *outfile;
|
||||
|
||||
#define JMAX 64 /* maximum Joliet file name length (spec) */
|
||||
#define JLONGMAX 103 /* out of spec Joliet file name length */
|
||||
@@ -1,204 +0,0 @@
|
||||
diff --git a/doc/icedax/tracknames.pl b/doc/icedax/tracknames.pl
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
index 09f0fcf..801b89e
|
||||
--- a/doc/icedax/tracknames.pl
|
||||
+++ b/doc/icedax/tracknames.pl
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/local/bin/perl
|
||||
+#!/usr/bin/perl
|
||||
# A quick perl hack to get rename files pulled in with icedax.
|
||||
# by billo@billo.com
|
||||
#
|
||||
diff --git a/genisoimage/eltorito.c b/genisoimage/eltorito.c
|
||||
index b97bdf1..5d7c2d1 100644
|
||||
--- a/genisoimage/eltorito.c
|
||||
+++ b/genisoimage/eltorito.c
|
||||
@@ -59,7 +59,7 @@ static void get_torito_desc(struct eltorito_boot_descriptor *boot_desc);
|
||||
static void fill_boot_desc(struct eltorito_defaultboot_entry *boot_desc_entry,
|
||||
struct eltorito_boot_entry_info *boot_entry);
|
||||
void get_boot_entry(void);
|
||||
-void new_boot_entry(void);
|
||||
+void new_boot_entry();
|
||||
static int tvd_write(FILE *outfile);
|
||||
|
||||
|
||||
@@ -283,6 +283,7 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc)
|
||||
int i;
|
||||
int offset;
|
||||
struct eltorito_defaultboot_entry boot_desc_record;
|
||||
+ struct eltorito_sectionheader_entry section_header;
|
||||
|
||||
memset(boot_desc, 0, sizeof (*boot_desc));
|
||||
boot_desc->type[0] = 0;
|
||||
@@ -317,7 +318,7 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc)
|
||||
*/
|
||||
memset(&valid_desc, 0, sizeof (valid_desc));
|
||||
valid_desc.headerid[0] = 1;
|
||||
- valid_desc.arch[0] = EL_TORITO_ARCH_x86;
|
||||
+ valid_desc.arch[0] = first_boot_entry->arch;
|
||||
|
||||
/*
|
||||
* we'll shove start of publisher id into id field,
|
||||
@@ -347,10 +348,53 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc)
|
||||
/* now write it to the virtual boot catalog */
|
||||
memcpy(de2->table, &valid_desc, 32);
|
||||
|
||||
- for (current_boot_entry = first_boot_entry, offset = sizeof (valid_desc);
|
||||
- current_boot_entry != NULL;
|
||||
- current_boot_entry = current_boot_entry->next,
|
||||
- offset += sizeof (boot_desc_record)) {
|
||||
+ /* Fill the first entry, since it's special and already has the
|
||||
+ * matching header via the validation header... */
|
||||
+ offset = sizeof (valid_desc);
|
||||
+ current_boot_entry = first_boot_entry;
|
||||
+
|
||||
+ if (offset >= SECTOR_SIZE) {
|
||||
+#ifdef USE_LIBSCHILY
|
||||
+ comerrno(EX_BAD, "Too many El Torito boot entries\n");
|
||||
+#else
|
||||
+ fprintf(stderr, "Too many El Torito boot entries\n");
|
||||
+ exit(1);
|
||||
+#endif
|
||||
+ }
|
||||
+ fill_boot_desc(&boot_desc_record, current_boot_entry);
|
||||
+ memcpy(de2->table + offset, &boot_desc_record,
|
||||
+ sizeof (boot_desc_record));
|
||||
+
|
||||
+ offset += sizeof(boot_desc_record);
|
||||
+
|
||||
+ for (current_boot_entry = current_boot_entry->next;
|
||||
+ current_boot_entry != NULL;
|
||||
+ current_boot_entry = current_boot_entry->next) {
|
||||
+ struct eltorito_sectionheader_entry section_header;
|
||||
+
|
||||
+ if (offset >= SECTOR_SIZE) {
|
||||
+#ifdef USE_LIBSCHILY
|
||||
+ comerrno(EX_BAD,
|
||||
+ "Too many El Torito boot entries\n");
|
||||
+#else
|
||||
+ fprintf(stderr,
|
||||
+ "Too many El Torito boot entries\n");
|
||||
+ exit(1);
|
||||
+#endif
|
||||
+ }
|
||||
+
|
||||
+ memset(§ion_header, '\0', sizeof(section_header));
|
||||
+ if (current_boot_entry->next)
|
||||
+ section_header.headerid[0] = EL_TORITO_SECTION_HEADER;
|
||||
+ else
|
||||
+ section_header.headerid[0] = EL_TORITO_LAST_SECTION_HEADER;
|
||||
+
|
||||
+ section_header.arch[0] = current_boot_entry->arch;
|
||||
+ set_721(section_header.num_entries, 1);
|
||||
+
|
||||
+ memcpy(de2->table + offset, §ion_header,
|
||||
+ sizeof(section_header));
|
||||
+ offset += sizeof(section_header);
|
||||
|
||||
if (offset >= SECTOR_SIZE) {
|
||||
#ifdef USE_LIBSCHILY
|
||||
@@ -365,6 +409,8 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc)
|
||||
fill_boot_desc(&boot_desc_record, current_boot_entry);
|
||||
memcpy(de2->table + offset, &boot_desc_record,
|
||||
sizeof (boot_desc_record));
|
||||
+ offset += sizeof (boot_desc_record);
|
||||
+
|
||||
}
|
||||
}/* get_torito_desc(... */
|
||||
|
||||
diff --git a/genisoimage/genisoimage.c b/genisoimage/genisoimage.c
|
||||
index a5b0b46..8add1ac 100644
|
||||
--- a/genisoimage/genisoimage.c
|
||||
+++ b/genisoimage/genisoimage.c
|
||||
@@ -47,6 +47,7 @@
|
||||
|
||||
#include <mconfig.h>
|
||||
#include "genisoimage.h"
|
||||
+#include "iso9660.h"
|
||||
#include <errno.h>
|
||||
#include <timedefs.h>
|
||||
#include <fctldefs.h>
|
||||
@@ -523,6 +524,8 @@ static const struct ld_option ld_options[] =
|
||||
'\0', NULL, "Set debug flag", ONE_DASH},
|
||||
{{"eltorito-boot", required_argument, NULL, 'b'},
|
||||
'b', "FILE", "Set El Torito boot image name", ONE_DASH},
|
||||
+ {{"efi-boot", required_argument, NULL, 'e'},
|
||||
+ 'e', "FILE", "Set EFI boot image name", ONE_DASH},
|
||||
{{"eltorito-alt-boot", no_argument, NULL, OPTION_ALT_BOOT},
|
||||
'\0', NULL, "Start specifying alternative El Torito boot parameters", ONE_DASH},
|
||||
{{"sparc-boot", required_argument, NULL, 'B'},
|
||||
@@ -1502,6 +1505,7 @@ int main(int argc, char *argv[])
|
||||
all_files = 0;
|
||||
break;
|
||||
case 'b':
|
||||
+ case 'e':
|
||||
do_sort++; /* We sort bootcat/botimage */
|
||||
use_eltorito++;
|
||||
boot_image = optarg; /* pathname of the boot image */
|
||||
@@ -1517,6 +1521,10 @@ int main(int argc, char *argv[])
|
||||
#endif
|
||||
}
|
||||
get_boot_entry();
|
||||
+ if (c == 'e')
|
||||
+ current_boot_entry->arch = EL_TORITO_ARCH_EFI;
|
||||
+ else
|
||||
+ current_boot_entry->arch = EL_TORITO_ARCH_x86;
|
||||
current_boot_entry->boot_image = boot_image;
|
||||
break;
|
||||
case OPTION_ALT_BOOT:
|
||||
diff --git a/genisoimage/genisoimage.h b/genisoimage/genisoimage.h
|
||||
index bbedfb0..76e5e21 100644
|
||||
--- a/genisoimage/genisoimage.h
|
||||
+++ b/genisoimage/genisoimage.h
|
||||
@@ -293,6 +293,7 @@ struct deferred_write {
|
||||
struct eltorito_boot_entry_info {
|
||||
struct eltorito_boot_entry_info *next;
|
||||
char *boot_image;
|
||||
+ char arch;
|
||||
int not_bootable;
|
||||
int no_emul_boot;
|
||||
int hard_disk_boot;
|
||||
diff --git a/genisoimage/iso9660.h b/genisoimage/iso9660.h
|
||||
index c74c2a9..c8b7a05 100644
|
||||
--- a/genisoimage/iso9660.h
|
||||
+++ b/genisoimage/iso9660.h
|
||||
@@ -62,10 +62,14 @@ struct iso_volume_descriptor {
|
||||
#define EL_TORITO_ARCH_x86 0
|
||||
#define EL_TORITO_ARCH_PPC 1
|
||||
#define EL_TORITO_ARCH_MAC 2
|
||||
+#define EL_TORITO_ARCH_EFI 0xef
|
||||
|
||||
#define EL_TORITO_BOOTABLE 0x88
|
||||
#define EL_TORITO_NOT_BOOTABLE 0
|
||||
|
||||
+#define EL_TORITO_SECTION_HEADER 0x90
|
||||
+#define EL_TORITO_LAST_SECTION_HEADER 0x91
|
||||
+
|
||||
#define EL_TORITO_MEDIA_NOEMUL 0
|
||||
#define EL_TORITO_MEDIA_12FLOP 1
|
||||
#define EL_TORITO_MEDIA_144FLOP 2
|
||||
@@ -173,7 +177,7 @@ struct eltorito_validation_entry {
|
||||
struct eltorito_defaultboot_entry {
|
||||
char boot_id [ISODCL(1, 1)]; /* 711 */
|
||||
char boot_media [ISODCL(2, 2)];
|
||||
- char loadseg [ISODCL(3, 4)]; /* 711 */
|
||||
+ char loadseg [ISODCL(3, 4)]; /* 712 */
|
||||
char sys_type [ISODCL(5, 5)];
|
||||
char pad1 [ISODCL(6, 6)];
|
||||
char nsect [ISODCL(7, 8)];
|
||||
@@ -181,6 +185,14 @@ struct eltorito_defaultboot_entry {
|
||||
char pad2 [ISODCL(13, 32)];
|
||||
};
|
||||
|
||||
+/* El Torito Section Header Entry in boot catalog */
|
||||
+struct eltorito_sectionheader_entry {
|
||||
+ char headerid [ISODCL(1, 1)]; /* 711 */
|
||||
+ char arch [ISODCL(2, 2)];
|
||||
+ char num_entries [ISODCL(3, 4)]; /* 711 */
|
||||
+ char id [ISODCL(5, 32)];
|
||||
+};
|
||||
+
|
||||
/*
|
||||
* XXX JS: The next two structures have odd lengths!
|
||||
* Some compilers (e.g. on Sun3/mc68020) padd the structures to even length.
|
||||
@@ -1,9 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 57edba6..d06b6d9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,3 +1,4 @@
|
||||
PROJECT (cdrkit C)
|
||||
+INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include)
|
||||
SUBDIRS(include genisoimage wodim libedc libhfs_iso libparanoia icedax libusal librols libunls readom netscsid 3rd-party/dirsplit)
|
||||
|
||||
@@ -1,30 +1,30 @@
|
||||
{lib, stdenv, fetchurl, cmake, libcap, zlib, bzip2, perl}:
|
||||
{lib, stdenv, fetchFromGitLab, cmake, libcap, zlib, bzip2, perl, quilt}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cdrkit";
|
||||
version = "1.1.11";
|
||||
version = "1.1.11-3.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://cdrkit.org/releases/cdrkit-${version}.tar.gz";
|
||||
sha256 = "1nj7iv3xrq600i37na9a5idd718piiiqbs4zxvpjs66cdrsk1h6i";
|
||||
src = fetchFromGitLab {
|
||||
domain = "salsa.debian.org";
|
||||
owner = "debian";
|
||||
repo = "cdrkit";
|
||||
rev = "debian/9%${finalAttrs.version}";
|
||||
hash = "sha256-T7WhztbpVvGegF6rTHGTkEALq+mcAtTerzDQ3f6Cq78=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake quilt ];
|
||||
buildInputs = [ zlib bzip2 perl ] ++
|
||||
lib.optionals stdenv.hostPlatform.isLinux [ libcap ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isMusl [
|
||||
"-D__THROW="
|
||||
] ++ lib.optionals stdenv.cc.isClang [
|
||||
"-Wno-error=int-conversion"
|
||||
"-Wno-error=implicit-function-declaration"
|
||||
]);
|
||||
|
||||
# efi-boot-patch extracted from http://arm.koji.fedoraproject.org/koji/rpminfo?rpmID=174244
|
||||
patches = [ ./include-path.patch ./cdrkit-1.1.9-efi-boot.patch ./cdrkit-1.1.11-fno-common.patch ];
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
postPatch = ''
|
||||
QUILT_PATCHES=debian/patches quilt push -a
|
||||
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace libusal/scsi-mac-iokit.c \
|
||||
--replace "IOKit/scsi-commands/SCSITaskLib.h" "IOKit/scsi/SCSITaskLib.h"
|
||||
substituteInPlace genisoimage/sha256.c \
|
||||
@@ -75,4 +75,4 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,10 +9,13 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
export makeFlags="$makeFlags PREFIX='$out'"
|
||||
mkdir -p "$out/bin"
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
sed -e 's/\t\t@/\t\t/g' -i Makefile
|
||||
'';
|
||||
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patchPhase = ''
|
||||
# include <unistd.h> to fix undefined getcwd
|
||||
sed -ie 's/<stdlib.h>/<stdlib.h>\n#include <unistd.h>/' src/CTPP2FileSourceLoader.cpp
|
||||
sed -i -e 's/<stdlib.h>/<stdlib.h>\n#include <unistd.h>/' src/CTPP2FileSourceLoader.cpp
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
sha256 = "19cmrlx4khn30qqrpyayn7bicg8yi0wpz1x1bvqqrbvr3kwldxyj";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/cuneiform/files/cuneiform-1.1.0-gcc11.patch";
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/cuneiform/files/cuneiform-1.1.0-gcc11.patch?id=fd8e596c6a5eab634656e265c3da5241f5ceee8c";
|
||||
sha256 = "14bp2f4dvlgxnpdza1rgszhkbxhp6p7lhgnb1s7c1x7vwdrx0ri7";
|
||||
})
|
||||
];
|
||||
|
||||
@@ -24,12 +24,12 @@ stdenv.mkDerivation rec {
|
||||
configurePhase = ''
|
||||
cd daemontools-${version}
|
||||
|
||||
sed -ie '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc
|
||||
sed -i -e '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc
|
||||
|
||||
substituteInPlace src/Makefile \
|
||||
--replace '/bin/sh' '${bash}/bin/bash -oxtrace'
|
||||
|
||||
sed -ie "s_^PATH=.*_PATH=$src/daemontools-${version}/compile:''${PATH}_" src/rts.tests
|
||||
sed -i -e "s_^PATH=.*_PATH=$src/daemontools-${version}/compile:''${PATH}_" src/rts.tests
|
||||
|
||||
cat ${glibc.dev}/include/errno.h
|
||||
'';
|
||||
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
(fetchurl {
|
||||
name = "gcc-4.7.patch";
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/"
|
||||
+ "dbus-c++/files/dbus-c++-0.9.0-gcc-4.7.patch";
|
||||
+ "dbus-c++/files/dbus-c++-0.9.0-gcc-4.7.patch?id=dec60bb6900d6ebdaaa6aa1dcb845b30b739f9b5";
|
||||
sha256 = "0rwcz9pvc13b3yfr0lkifnfz0vb5q6dg240bzgf37ni4s8rpc72g";
|
||||
})
|
||||
(fetchpatch {
|
||||
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1p1fiygq9ny8aimwc4vxwjc6k9ykgdsq1sq06slfbzalfvm0kl7w";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
outputs = [ "bin" "out" "dev" "lib" "man" ];
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,96 @@
|
||||
From a8a7f4460b8f46ca752389f3e1fa43b5c95f2bac Mon Sep 17 00:00:00 2001
|
||||
From: Emily <hello@emily.moe>
|
||||
Date: Thu, 28 Nov 2024 05:56:34 +0000
|
||||
Subject: [PATCH] Remove use of deprecated `<boost/filesystem/convenience.hpp>`
|
||||
|
||||
This header was dropped in Boost 1.85.
|
||||
---
|
||||
client_generic/Client/Player.cpp | 3 ---
|
||||
client_generic/Client/lua_playlist.h | 3 ---
|
||||
client_generic/ContentDecoder/graph_playlist.h | 4 +---
|
||||
client_generic/TupleStorage/luastorage.cpp | 3 ---
|
||||
4 files changed, 1 insertion(+), 12 deletions(-)
|
||||
|
||||
diff --git a/client_generic/Client/Player.cpp b/client_generic/Client/Player.cpp
|
||||
index 1f65d761..9726b014 100644
|
||||
--- a/client_generic/Client/Player.cpp
|
||||
+++ b/client_generic/Client/Player.cpp
|
||||
@@ -60,7 +60,6 @@
|
||||
|
||||
#include "boost/filesystem/path.hpp"
|
||||
#include "boost/filesystem/operations.hpp"
|
||||
-#include "boost/filesystem/convenience.hpp"
|
||||
|
||||
#if defined(MAC) || defined(WIN32)
|
||||
#define HONOR_VBL_SYNC
|
||||
@@ -68,8 +67,6 @@
|
||||
|
||||
using boost::filesystem::path;
|
||||
using boost::filesystem::exists;
|
||||
-using boost::filesystem::directory_iterator;
|
||||
-using boost::filesystem::extension;
|
||||
|
||||
using namespace DisplayOutput;
|
||||
|
||||
diff --git a/client_generic/Client/lua_playlist.h b/client_generic/Client/lua_playlist.h
|
||||
index fbe5a333..511c86ee 100644
|
||||
--- a/client_generic/Client/lua_playlist.h
|
||||
+++ b/client_generic/Client/lua_playlist.h
|
||||
@@ -17,13 +17,10 @@
|
||||
|
||||
#include "boost/filesystem/path.hpp"
|
||||
#include "boost/filesystem/operations.hpp"
|
||||
-#include "boost/filesystem/convenience.hpp"
|
||||
#include <boost/thread.hpp>
|
||||
|
||||
using boost::filesystem::path;
|
||||
using boost::filesystem::exists;
|
||||
-using boost::filesystem::directory_iterator;
|
||||
-using boost::filesystem::extension;
|
||||
|
||||
|
||||
// Lua.
|
||||
diff --git a/client_generic/ContentDecoder/graph_playlist.h b/client_generic/ContentDecoder/graph_playlist.h
|
||||
index 1f0a6cd0..cc2672e2 100644
|
||||
--- a/client_generic/ContentDecoder/graph_playlist.h
|
||||
+++ b/client_generic/ContentDecoder/graph_playlist.h
|
||||
@@ -13,13 +13,11 @@
|
||||
|
||||
#include "boost/filesystem/path.hpp"
|
||||
#include "boost/filesystem/operations.hpp"
|
||||
-#include "boost/filesystem/convenience.hpp"
|
||||
|
||||
using boost::filesystem::path;
|
||||
using boost::filesystem::exists;
|
||||
using boost::filesystem::no_check;
|
||||
using boost::filesystem::directory_iterator;
|
||||
-using boost::filesystem::extension;
|
||||
|
||||
namespace ContentDecoder
|
||||
{
|
||||
@@ -116,7 +114,7 @@ class CGraphPlaylist : public CPlaylist
|
||||
for( directory_iterator i( _dir ), end; i != end; ++i )
|
||||
{
|
||||
#warning TODO (Keffo#1#): Remove hardcoded extension...
|
||||
- if( extension(*i) != ".avi" )
|
||||
+ if( i->extension().string() != ".avi" )
|
||||
continue;
|
||||
|
||||
std::string file = i->string();
|
||||
diff --git a/client_generic/TupleStorage/luastorage.cpp b/client_generic/TupleStorage/luastorage.cpp
|
||||
index efbe8867..9b2ffa93 100644
|
||||
--- a/client_generic/TupleStorage/luastorage.cpp
|
||||
+++ b/client_generic/TupleStorage/luastorage.cpp
|
||||
@@ -9,12 +9,9 @@
|
||||
|
||||
#include "boost/filesystem/path.hpp"
|
||||
#include "boost/filesystem/operations.hpp"
|
||||
-#include "boost/filesystem/convenience.hpp"
|
||||
|
||||
using boost::filesystem::path;
|
||||
using boost::filesystem::exists;
|
||||
-using boost::filesystem::directory_iterator;
|
||||
-using boost::filesystem::extension;
|
||||
|
||||
using namespace std;
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
, pkg-config
|
||||
, flam3
|
||||
, libgtop
|
||||
, boost179
|
||||
, boost
|
||||
, tinyxml
|
||||
, libglut
|
||||
, libGLU
|
||||
@@ -30,6 +30,11 @@ stdenv.mkDerivation {
|
||||
hash = "sha256-X3EZ1/VcLEU1GkZbskWSsqQWYTnsH3pbFDvDLpdLmcU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# <https://github.com/scottdraves/electricsheep/pull/126>
|
||||
./boost-1.85.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
@@ -41,7 +46,7 @@ stdenv.mkDerivation {
|
||||
xorg.libXrender
|
||||
flam3
|
||||
libgtop
|
||||
boost179
|
||||
boost
|
||||
tinyxml
|
||||
libglut
|
||||
libGLU
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ell";
|
||||
version = "0.69";
|
||||
version = "0.70";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
separateDebugInfo = true;
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchgit {
|
||||
url = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
|
||||
rev = version;
|
||||
hash = "sha256-FOEVnpndbIufb8i6egBIoG1PC01WxtAlf3I47YqM+hk=";
|
||||
hash = "sha256-2JPmS+OuK1cQyBRR0kDDWXBDUWUZuK/vsQ483GLu/S0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -58,10 +58,8 @@ stdenv.mkDerivation {
|
||||
"RacketInclude=${racket}/include/racket"
|
||||
"RacketLib=${racket}/lib/racket"
|
||||
"DESTDIR=build"
|
||||
"Prefix=${placeholder "out"}"
|
||||
];
|
||||
configurePhase = ''
|
||||
sconsFlags+=" Prefix=$out"
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r build$out/* $out/
|
||||
|
||||
@@ -90,11 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# occur inconsistently
|
||||
doCheck = false;
|
||||
|
||||
mesonCheckFlags = [
|
||||
# Prevents e-d-s add-contacts-stress-test from timing out
|
||||
"--timeout-multiplier" "4"
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString telepathySupport ''
|
||||
patchShebangs tests/tools/manager-file.py
|
||||
'';
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user