movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

staging-next 2024-12-04 (#361878)

Browse source
This commit is contained in:
Vladimír Čunát 2024-12-23 14:57:53 +01:00
commit fc9c33366b
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1126 changed files with 14290 additions and 26524 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.editorconfig
View file

@ -24,7 +24,7 @@ insert_final_newline = false
# see https://nixos.org/nixpkgs/manual/#chap-conventions # see https://nixos.org/nixpkgs/manual/#chap-conventions
# Match json/lockfiles/markdown/nix/perl/python/ruby/shell/docbook files, set indent to spaces # 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 indent_style = space
# Match docbook files, set indent width of one # Match docbook files, set indent width of one
@ -36,7 +36,7 @@ indent_size = 1
indent_size = 2 indent_size = 2
# Match perl/python/shell scripts, set indent width of four # Match perl/python/shell scripts, set indent width of four
[*.{pl,pm,py,sh}] [*.{bash,pl,pm,py,sh}]
indent_size = 4 indent_size = 4
# Match gemfiles, set indent to spaces with width of two # Match gemfiles, set indent to spaces with width of two

1
.github/labeler.yml vendored
View file

@ -181,6 +181,7 @@
- pkgs/development/compilers/corretto/**/* - pkgs/development/compilers/corretto/**/*
- pkgs/development/compilers/graalvm/**/* - pkgs/development/compilers/graalvm/**/*
- pkgs/development/compilers/openjdk/**/* - pkgs/development/compilers/openjdk/**/*
- pkgs/by-name/op/openjfx/**/*
- pkgs/development/compilers/semeru-bin/**/* - pkgs/development/compilers/semeru-bin/**/*
- pkgs/development/compilers/temurin-bin/**/* - pkgs/development/compilers/temurin-bin/**/*
- pkgs/development/compilers/zulu/**/* - pkgs/development/compilers/zulu/**/*

36
doc/languages-frameworks/vim.section.md
View file

@ -234,9 +234,17 @@ Finally, there are some plugins that are also packaged in nodePackages because t
### Testing Neovim plugins {#testing-neovim-plugins} ### 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 `nvimRequireCheck` 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 ```nix
gitsigns-nvim = super.gitsigns-nvim.overrideAttrs { gitsigns-nvim = super.gitsigns-nvim.overrideAttrs {
@ -244,6 +252,30 @@ This can be manually added through plugin definition overrides in the [overrides
nvimRequireCheck = "gitsigns"; 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} ### Plugin optional configuration {#vim-plugin-required-snippet}

3
doc/redirects.json
View file

@ -3769,6 +3769,9 @@
"testing-neovim-plugins": [ "testing-neovim-plugins": [
"index.html#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": [ "vim-plugin-required-snippet": [
"index.html#vim-plugin-required-snippet" "index.html#vim-plugin-required-snippet"
], ],

35
doc/stdenv/platform-notes.chapter.md
View file

@ -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. 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. 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 | | Xcode version | SDK version | Nixpkgs attribute |
|--------------------|---------------------------------------------------|-------------------| |--------------------|--------------------|------------------------------|
| Varies by platform | 10.12.2 (x86_64-darwin)<br/>11.3 (aarch64-darwin) | `apple-sdk` | | 12.0–12.5.1 | 11.3 | `apple-sdk_11` / `apple-sdk` |
| 8.0–8.3.3 | 10.12.2 | `apple-sdk_10_12` | | 13.0–13.4.1 | 12.3 | `apple-sdk_12` |
| 9.0–9.4.1 | 10.13.2 | `apple-sdk_10_13` | | 14.0–14.3.1 | 13.3 | `apple-sdk_13` |
| 10.0–10.3 | 10.14.6 | `apple-sdk_10_14` | | 15.0–15.4 | 14.4 | `apple-sdk_14` |
| 11.0–11.7 | 10.15.6 | `apple-sdk_10_15` | | 16.0 | 15.0 | `apple-sdk_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` |
#### Darwin Default SDK versions {#sec-darwin-troubleshooting-darwin-defaults} #### 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. 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. On macOS, the `darwinMinVersion` and `darwinSdkVersion` are always the same, and are currently set to 11.3.
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.
#### `xcrun` cannot find a binary {#sec-darwin-troubleshooting-xcrun} #### `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. 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. 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. - `pkgs.darwin.apple_sdk_11_0.callPackage` - this pattern was used to provide frameworks from the macOS 11 SDK.
It now adds the `apple-sdk_11` package to your derivation’s build inputs. 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. - `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. If `darwinMinVersion` is specified, it will add `darwinMinVersionHook` with the specified minimum version.
No other SDK versions are supported. No other SDK versions are supported.

4
lib/systems/default.nix
View file

@ -261,7 +261,7 @@ let
else null; else null;
# The canonical name for this attribute is darwinSdkVersion, but some # The canonical name for this attribute is darwinSdkVersion, but some
# platforms define the old name "sdkVer". # 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; darwinMinVersion = final.darwinSdkVersion;
darwinMinVersionVariable = darwinMinVersionVariable =
if final.isMacOS then "MACOSX_DEPLOYMENT_TARGET" if final.isMacOS then "MACOSX_DEPLOYMENT_TARGET"
@ -293,7 +293,7 @@ let
# to an emulator program. That is, if an emulator requires additional # to an emulator program. That is, if an emulator requires additional
# arguments, a wrapper should be used. # arguments, a wrapper should be used.
if pkgs.stdenv.hostPlatform.canExecute final if pkgs.stdenv.hostPlatform.canExecute final
then "${pkgs.execline}/bin/exec" then lib.getExe (pkgs.writeShellScriptBin "exec" ''exec "$@"'')
else if final.isWindows else if final.isWindows
then "${wine}/bin/wine${optionalString (final.parsed.cpu.bits == 64) "64"}" then "${wine}/bin/wine${optionalString (final.parsed.cpu.bits == 64) "64"}"
else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux && final.qemuArch != null else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux && final.qemuArch != null

82
maintainers/scripts/bootstrap-files/refresh-tarballs.bash
View file

@ -35,15 +35,15 @@ Synopsis:
This is usually done in the following cases: This is usually done in the following cases:
1. Single target fix: current bootstrap files for a single target 1. Single target fix: current bootstrap files for a single target
are problematic for some reason (target-specific bug). In this are problematic for some reason (target-specific bug). In this
case we can refresh just that target as: 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 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' To get help on uploading refreshed binaries to 'tarballs.nixos.org'
please have a look at <maintainers/scripts/bootstrap-files/README.md>. please have a look at <maintainers/scripts/bootstrap-files/README.md>.
@ -232,50 +232,50 @@ for target in "${targets[@]}"; do
# - build time: ${build_time} # - build time: ${build_time}
{ {
EOF EOF
for p in "${outpath}/on-server"/*; do for p in "${outpath}/on-server"/*; do
fname=$(basename "$p") fname=$(basename "$p")
fnames+=("$fname") fnames+=("$fname")
case "$fname" in case "$fname" in
bootstrap-tools.tar.xz) attr=bootstrapTools ;; bootstrap-tools.tar.xz) attr=bootstrapTools ;;
busybox) attr=$fname ;; busybox) attr=$fname ;;
unpack.nar.xz) attr=unpack ;; unpack.nar.xz) attr=unpack ;;
*) die "Don't know how to map '$fname' to attribute name. Please update me." *) die "Don't know how to map '$fname' to attribute name. Please update me."
esac esac
executable_arg= executable_arg=
executable_nix= executable_nix=
if [[ -x "$p" ]]; then if [[ -x "$p" ]]; then
executable_arg="--executable" executable_arg="--executable"
executable_nix="executable = true;" executable_nix="executable = true;"
fi fi
unpack_nix= unpack_nix=
name_nix= name_nix=
if [[ $fname = *.nar.xz ]]; then if [[ $fname = *.nar.xz ]]; then
unpack_nix="unpack = true;" unpack_nix="unpack = true;"
name_nix="name = \"${fname%.nar.xz}\";" name_nix="name = \"${fname%.nar.xz}\";"
sri=$(nar_sri_get "$p" "${fname%.nar.xz}") sri=$(nar_sri_get "$p" "${fname%.nar.xz}")
[[ $? -ne 0 ]] && die "Failed to get hash of '$p'" [[ $? -ne 0 ]] && die "Failed to get hash of '$p'"
else else
sha256=$(nix-prefetch-url $executable_arg --name "$fname" "file://$p") sha256=$(nix-prefetch-url $executable_arg --name "$fname" "file://$p")
[[ $? -ne 0 ]] && die "Failed to get the hash for '$p'" [[ $? -ne 0 ]] && die "Failed to get the hash for '$p'"
sri=$(nix-hash --to-sri "sha256:$sha256") sri=$(nix-hash --to-sri "sha256:$sha256")
[[ $? -ne 0 ]] && die "Failed to convert '$sha256' hash to an SRI form" [[ $? -ne 0 ]] && die "Failed to convert '$sha256' hash to an SRI form"
fi fi
# individual file entries # individual file entries
cat <<EOF cat <<EOF
$attr = import <nix/fetchurl.nix> { $attr = import <nix/fetchurl.nix> {
url = "http://tarballs.nixos.org/${s3_prefix}/${nixpkgs_revision}/$fname"; url = "http://tarballs.nixos.org/${s3_prefix}/${nixpkgs_revision}/$fname";
hash = "${sri}";$( hash = "${sri}";$(
[[ -n ${executable_nix} ]] && printf "\n %s" "${executable_nix}" [[ -n ${executable_nix} ]] && printf "\n %s" "${executable_nix}"
[[ -n ${name_nix} ]] && printf "\n %s" "${name_nix}" [[ -n ${name_nix} ]] && printf "\n %s" "${name_nix}"
[[ -n ${unpack_nix} ]] && printf "\n %s" "${unpack_nix}" [[ -n ${unpack_nix} ]] && printf "\n %s" "${unpack_nix}"
) )
}; };
EOF EOF
done done
# footer # footer
cat <<EOF cat <<EOF
} }
EOF EOF
} > "${target_file}" } > "${target_file}"

13
nixos/doc/manual/release-notes/rl-2505.section.md
View file

@ -4,10 +4,21 @@
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- **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. - The default PHP version has been updated to 8.3.
- `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is available for testing. You can enable it by setting [system.rebuild.enableNg](options.html#opt-system.rebuild.enableNg) in your configuration (this will replace the old `nixos-rebuild`), or by adding `nixos-rebuild-ng` to your `environment.systemPackages` (in this case, it will live side-by-side with `nixos-rebuild` as `nixos-rebuild-ng`). It is expected that the next major version of NixOS (25.11) will enable `system.rebuild.enableNg` by default. - `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is available for testing. You can enable it by setting [system.rebuild.enableNg](options.html#opt-system.rebuild.enableNg) in your configuration (this will replace the old `nixos-rebuild`), or by adding `nixos-rebuild-ng` to your `environment.systemPackages` (in this case, it will live side-by-side with `nixos-rebuild` as `nixos-rebuild-ng`). It is expected that the next major version of NixOS (25.11) will enable `system.rebuild.enableNg` by default.
- A `nixos-rebuild build-image` sub-command has been added. - A `nixos-rebuild build-image` sub-command has been added.
It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-image-nixos-rebuild-build-image). It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-image-nixos-rebuild-build-image).

7
nixos/modules/services/video/frigate.nix
View file

@ -13,7 +13,6 @@ let
filterAttrsRecursive filterAttrsRecursive
hasPrefix hasPrefix
makeLibraryPath makeLibraryPath
match
mkDefault mkDefault
mkEnableOption mkEnableOption
mkPackageOption mkPackageOption
@ -108,10 +107,6 @@ let
withCoralUSB = any (d: d.type == "edgetpu" && hasPrefix "usb" d.device or "") detectors; withCoralUSB = any (d: d.type == "edgetpu" && hasPrefix "usb" d.device or "") detectors;
withCoralPCI = any (d: d.type == "edgetpu" && hasPrefix "pci" d.device or "") detectors; withCoralPCI = any (d: d.type == "edgetpu" && hasPrefix "pci" d.device or "") detectors;
withCoral = withCoralPCI || withCoralUSB; 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 in
{ {
@ -572,7 +567,7 @@ in
path = with pkgs; [ path = with pkgs; [
# unfree: # unfree:
# config.boot.kernelPackages.nvidiaPackages.latest.bin # config.boot.kernelPackages.nvidiaPackages.latest.bin
ffmpeg' ffmpeg-headless
libva-utils libva-utils
procps procps
radeontop radeontop

2
nixos/tests/prometheus-exporters.nix
View file

@ -219,7 +219,7 @@ let
succeed( succeed(
'echo \'${postData}\'> /tmp/data.json' '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( succeed(
"curl -sSfH 'Content-Type: application/json' -X POST --data @/tmp/data.json localhost:9103/collectd" "curl -sSfH 'Content-Type: application/json' -X POST --data @/tmp/data.json localhost:9103/collectd"
) )

4
pkgs/applications/audio/faust/faust2.nix
View file

@ -6,7 +6,7 @@
makeWrapper, makeWrapper,
pkg-config, pkg-config,
cmake, cmake,
llvm, llvm_18, # does not build with 19+ due to API changes
emscripten, emscripten,
openssl, openssl,
libsndfile, libsndfile,
@ -64,7 +64,7 @@ let
which which
]; ];
buildInputs = [ buildInputs = [
llvm llvm_18
emscripten emscripten
openssl openssl
libsndfile libsndfile

4
pkgs/applications/audio/fluidsynth/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fluidsynth"; pname = "fluidsynth";
version = "2.3.6"; version = "2.3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "FluidSynth"; owner = "FluidSynth";
repo = "fluidsynth"; repo = "fluidsynth";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-bmA4eUh7MC4dXPsOOi9Q5jneSE5OGUWrztv+46LxaW0="; hash = "sha256-4Jn8pyVPrTPYZGdPZB+8guxTbD6s/1OpmLJlioDQFMA=";
}; };
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];

20
pkgs/applications/audio/fmit/default.nix
View file

@ -50,13 +50,19 @@ mkDerivation rec {
substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}' substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}'
''; '';
preConfigure = '' qmakeFlags =
qmakeFlags="$qmakeFlags \ [
CONFIG+=${lib.optionalString alsaSupport "acs_alsa"} \ "PREFIXSHORTCUT=${placeholder "out"}"
CONFIG+=${lib.optionalString jackSupport "acs_jack"} \ ]
CONFIG+=${lib.optionalString portaudioSupport "acs_portaudio"} \ ++ lib.optionals alsaSupport [
PREFIXSHORTCUT=$out" "CONFIG+=acs_alsa"
''; ]
++ lib.optionals jackSupport [
"CONFIG+=acs_jack"
]
++ lib.optionals portaudioSupport [
"CONFIG+=acs_portaudio"
];
meta = with lib; { meta = with lib; {
description = "Free Musical Instrument Tuner"; description = "Free Musical Instrument Tuner";

4
pkgs/applications/audio/mpg123/default.nix
View file

@ -23,11 +23,11 @@ assert withConplay -> !libOnly;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "${lib.optionalString libOnly "lib"}mpg123"; pname = "${lib.optionalString libOnly "lib"}mpg123";
version = "1.32.8"; version = "1.32.9";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2"; url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2";
hash = "sha256-/u4TdMeVQODkBd8LxF/eIK1nARQlw2GidZ4hRolKJ6c="; hash = "sha256-A7YeQATpYLrPKs2toD7ZTTduaqsnpgFEe9SQjYQHspE=";
}; };
outputs = [ outputs = [

4
pkgs/applications/audio/snapcast/default.nix
View file

@ -7,7 +7,7 @@
alsa-lib, alsa-lib,
asio, asio,
avahi, avahi,
boost179, boost,
flac, flac,
libogg, libogg,
libvorbis, libvorbis,
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
# not needed # not needed
buildInputs = buildInputs =
[ [
boost179 boost
asio asio
avahi avahi
flac flac

4
pkgs/applications/audio/sonic-pi/default.nix
View file

@ -109,6 +109,7 @@ stdenv.mkDerivation rec {
"-DUSE_SYSTEM_LIBS=ON" "-DUSE_SYSTEM_LIBS=ON"
"-DBUILD_IMGUI_INTERFACE=${if withImGui then "ON" else "OFF"}" "-DBUILD_IMGUI_INTERFACE=${if withImGui then "ON" else "OFF"}"
"-DWITH_QT_GUI_WEBENGINE=${if withTauWidget then "ON" else "OFF"}" "-DWITH_QT_GUI_WEBENGINE=${if withTauWidget then "ON" else "OFF"}"
"-DAPP_INSTALL_ROOT=${placeholder "out"}/app"
]; ];
doCheck = true; doCheck = true;
@ -140,9 +141,6 @@ stdenv.mkDerivation rec {
# Prebuild Ruby vendored dependencies and Qt docs # Prebuild Ruby vendored dependencies and Qt docs
./linux-prebuild.sh -o ./linux-prebuild.sh -o
# Append CMake flag depending on the value of $out
cmakeFlags+=" -DAPP_INSTALL_ROOT=$out/app"
''; '';
postBuild = '' postBuild = ''

2
pkgs/applications/audio/vorbis-tools/default.nix
View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1c7h4ivgfdyygz2hyh6nfibxlkz8kdk868a576qkkjgj5gn78xyv"; sha256 = "1c7h4ivgfdyygz2hyh6nfibxlkz8kdk868a576qkkjgj5gn78xyv";
}; };
patches = lib.optionals stdenv.cc.isClang [ patches = [
# Fixes a call to undeclared function `utf8_decode`. # Fixes a call to undeclared function `utf8_decode`.
# https://github.com/xiph/vorbis-tools/pull/33 # https://github.com/xiph/vorbis-tools/pull/33
(fetchpatch { (fetchpatch {

6
pkgs/applications/blockchains/zcash/default.nix
View file

@ -1,6 +1,6 @@
{ {
autoreconfHook, autoreconfHook,
boost180, boost,
cargo, cargo,
coreutils, coreutils,
curl, curl,
@ -56,7 +56,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
buildInputs = buildInputs =
[ [
boost180 boost
db62 db62
libevent libevent
libsodium libsodium
@ -88,7 +88,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec {
configureFlags = [ configureFlags = [
"--disable-tests" "--disable-tests"
"--with-boost-libdir=${lib.getLib boost180}/lib" "--with-boost-libdir=${lib.getLib boost}/lib"
"RUST_TARGET=${stdenv.hostPlatform.rust.rustcTargetSpec}" "RUST_TARGET=${stdenv.hostPlatform.rust.rustcTargetSpec}"
]; ];

6
pkgs/applications/editors/emacs/build-support/wrapper.nix
View file

@ -82,7 +82,7 @@ runCommand (lib.appendToName "with-packages" emacs).name
# well :D. # well :D.
local varSlice="$var[*]" local varSlice="$var[*]"
# ''${..-} to hack around old bash empty array problem # ''${..-} to hack around old bash empty array problem
case "''${!varSlice-}" in case " ''${!varSlice-} " in
*" $pkg "*) return 0 ;; *" $pkg "*) return 0 ;;
esac esac
unset -v varSlice unset -v varSlice
@ -205,6 +205,8 @@ runCommand (lib.appendToName "with-packages" emacs).name
--subst-var-by bash ${emacs.stdenv.shell} \ --subst-var-by bash ${emacs.stdenv.shell} \
--subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \
--subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \ --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \
--subst-var-by wrapperInvocationDirectory "$out/bin/" \
--subst-var-by wrapperInvocationName "$progname" \
--subst-var prog --subst-var prog
chmod +x $out/bin/$progname chmod +x $out/bin/$progname
# Create a “NOP” binary wrapper for the pure sake of it becoming a # Create a “NOP” binary wrapper for the pure sake of it becoming a
@ -229,6 +231,8 @@ runCommand (lib.appendToName "with-packages" emacs).name
--subst-var-by bash ${emacs.stdenv.shell} \ --subst-var-by bash ${emacs.stdenv.shell} \
--subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \
--subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \ --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \
--subst-var-by wrapperInvocationDirectory "$out/Applications/Emacs.app/Contents/MacOS/" \
--subst-var-by wrapperInvocationName "Emacs" \
--subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs" --subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs"
chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs
wrapProgramBinary $out/Applications/Emacs.app/Contents/MacOS/Emacs wrapProgramBinary $out/Applications/Emacs.app/Contents/MacOS/Emacs

3
pkgs/applications/editors/emacs/build-support/wrapper.sh Normal file → Executable file
View file

@ -50,4 +50,7 @@ export emacsWithPackages_siteLisp=@wrapperSiteLisp@
export EMACSNATIVELOADPATH="${newNativeLoadPath[*]}" export EMACSNATIVELOADPATH="${newNativeLoadPath[*]}"
export emacsWithPackages_siteLispNative=@wrapperSiteLispNative@ export emacsWithPackages_siteLispNative=@wrapperSiteLispNative@
export emacsWithPackages_invocationDirectory=@wrapperInvocationDirectory@
export emacsWithPackages_invocationName=@wrapperInvocationName@
exec @prog@ "$@" exec @prog@ "$@"

671
pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
View file

File diff suppressed because it is too large Load diff

244
pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
View file

@ -441,10 +441,10 @@
elpaBuild { elpaBuild {
pname = "auctex-cont-latexmk"; pname = "auctex-cont-latexmk";
ename = "auctex-cont-latexmk"; ename = "auctex-cont-latexmk";
version = "0.2"; version = "0.3";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-cont-latexmk-0.2.tar"; url = "https://elpa.gnu.org/packages/auctex-cont-latexmk-0.3.tar";
sha256 = "0ggyjxjqwpx3h1963i8w96m6kisc65ni9hksn2kjfjddnj1hx0hf"; sha256 = "1s1fp8cajwcsvrnvbhnlzfsphpflsv6fzmc624578sz2m0p1wg6n";
}; };
packageRequires = [ auctex ]; packageRequires = [ auctex ];
meta = { meta = {
@ -655,10 +655,10 @@
elpaBuild { elpaBuild {
pname = "beframe"; pname = "beframe";
ename = "beframe"; ename = "beframe";
version = "1.1.1"; version = "1.2.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/beframe-1.1.1.tar"; url = "https://elpa.gnu.org/packages/beframe-1.2.1.tar";
sha256 = "0xx2zvgjilivi6nnr2x9bwwcifinj66j6r07wxjawqkrsknyypas"; sha256 = "0a92n45dy5f0d69a2dxzqfy7wvi9d7mrfjqy2z52gr2f8nkl7qgf";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -733,20 +733,26 @@
) { }; ) { };
bluetooth = callPackage ( bluetooth = callPackage (
{ {
compat,
dash, dash,
elpaBuild, elpaBuild,
fetchurl, fetchurl,
lib, lib,
transient,
}: }:
elpaBuild { elpaBuild {
pname = "bluetooth"; pname = "bluetooth";
ename = "bluetooth"; ename = "bluetooth";
version = "0.3.1"; version = "0.4.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/bluetooth-0.3.1.tar"; url = "https://elpa.gnu.org/packages/bluetooth-0.4.1.tar";
sha256 = "1yjqjm6cis6bq18li63hbhc4qzki3486xvdjkzs2gj4chc1yw1x4"; sha256 = "1chi9xjg5zcg6qycn2n442adhhmip1vpvg12szf1raq3zhg7lr01";
}; };
packageRequires = [ dash ]; packageRequires = [
compat
dash
transient
];
meta = { meta = {
homepage = "https://elpa.gnu.org/packages/bluetooth.html"; homepage = "https://elpa.gnu.org/packages/bluetooth.html";
license = lib.licenses.free; license = lib.licenses.free;
@ -1198,6 +1204,7 @@
) { }; ) { };
code-cells = callPackage ( code-cells = callPackage (
{ {
compat,
elpaBuild, elpaBuild,
fetchurl, fetchurl,
lib, lib,
@ -1205,12 +1212,12 @@
elpaBuild { elpaBuild {
pname = "code-cells"; pname = "code-cells";
ename = "code-cells"; ename = "code-cells";
version = "0.4"; version = "0.5";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/code-cells-0.4.tar"; url = "https://elpa.gnu.org/packages/code-cells-0.5.tar";
sha256 = "0kxpnydxlj8pqh54c4c80jlyc6jcplf89bkh3jmm509fmyr7sf20"; sha256 = "04fvn0lwvnvf907k13822jpxyyi6cf55v543i9iqy57dav6sn2jx";
}; };
packageRequires = [ ]; packageRequires = [ compat ];
meta = { meta = {
homepage = "https://elpa.gnu.org/packages/code-cells.html"; homepage = "https://elpa.gnu.org/packages/code-cells.html";
license = lib.licenses.free; license = lib.licenses.free;
@ -1241,19 +1248,24 @@
) { }; ) { };
comint-mime = callPackage ( comint-mime = callPackage (
{ {
compat,
elpaBuild, elpaBuild,
fetchurl, fetchurl,
lib, lib,
mathjax,
}: }:
elpaBuild { elpaBuild {
pname = "comint-mime"; pname = "comint-mime";
ename = "comint-mime"; ename = "comint-mime";
version = "0.6"; version = "0.7";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/comint-mime-0.6.tar"; url = "https://elpa.gnu.org/packages/comint-mime-0.7.tar";
sha256 = "017d62n3n2jmsxb3r9jm4vk8vpapddbxfjjh8ww1vgcbzqr76zwy"; sha256 = "1scf7b72kzqcf51svww3rbamdnm607pvzg04rdcglc2cna1n2apa";
}; };
packageRequires = [ ]; packageRequires = [
compat
mathjax
];
meta = { meta = {
homepage = "https://elpa.gnu.org/packages/comint-mime.html"; homepage = "https://elpa.gnu.org/packages/comint-mime.html";
license = lib.licenses.free; license = lib.licenses.free;
@ -1452,10 +1464,10 @@
elpaBuild { elpaBuild {
pname = "consult-denote"; pname = "consult-denote";
ename = "consult-denote"; ename = "consult-denote";
version = "0.2.1"; version = "0.2.2";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/consult-denote-0.2.1.tar"; url = "https://elpa.gnu.org/packages/consult-denote-0.2.2.tar";
sha256 = "15hih62a6lyfgw3ha86hppc9wp468gslrdcnx8kcz0dlkvp0k1kx"; sha256 = "1dpl9aq25j9nbrxa469gl584km93ry2rnkm0ydxljid9w15szpls";
}; };
packageRequires = [ packageRequires = [
consult consult
@ -1472,21 +1484,17 @@
consult, consult,
elpaBuild, elpaBuild,
fetchurl, fetchurl,
haskell-mode,
lib, lib,
}: }:
elpaBuild { elpaBuild {
pname = "consult-hoogle"; pname = "consult-hoogle";
ename = "consult-hoogle"; ename = "consult-hoogle";
version = "0.2.2"; version = "0.3.0";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/consult-hoogle-0.2.2.tar"; url = "https://elpa.gnu.org/packages/consult-hoogle-0.3.0.tar";
sha256 = "07z98nnxcaaws18by4id6c45yxlfwb9fk3p0gzll4ngym29zkd8c"; sha256 = "0jpyncx1zc8kzmnr0wlq81qz0y3jgk421yw0picjj8yflj6905ix";
}; };
packageRequires = [ packageRequires = [ consult ];
consult
haskell-mode
];
meta = { meta = {
homepage = "https://elpa.gnu.org/packages/consult-hoogle.html"; homepage = "https://elpa.gnu.org/packages/consult-hoogle.html";
license = lib.licenses.free; license = lib.licenses.free;
@ -1806,10 +1814,10 @@
elpaBuild { elpaBuild {
pname = "dape"; pname = "dape";
ename = "dape"; ename = "dape";
version = "0.16.0"; version = "0.17.0";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/dape-0.16.0.tar"; url = "https://elpa.gnu.org/packages/dape-0.17.0.tar";
sha256 = "0zv2l2d91ywbi2v36kn7na94lm09zz5yyq50xdf5i44h9ridz7zw"; sha256 = "113lmy0q1yk81cfi9dbig8p9bmhyqy6w1bvhn91m79my05ny2rxd";
}; };
packageRequires = [ jsonrpc ]; packageRequires = [ jsonrpc ];
meta = { meta = {
@ -1893,10 +1901,10 @@
elpaBuild { elpaBuild {
pname = "debbugs"; pname = "debbugs";
ename = "debbugs"; ename = "debbugs";
version = "0.41"; version = "0.42";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/debbugs-0.41.tar"; url = "https://elpa.gnu.org/packages/debbugs-0.42.tar";
sha256 = "0nchb7dnkrn34nh3bi0k5xmsn3da9m9v4iksh18045mfj6wn6bl5"; sha256 = "0n0kvkyzggn8q72dpy6c7rsjwn1rjx0r33y5jc080j7sw85xpigg";
}; };
packageRequires = [ soap-client ]; packageRequires = [ soap-client ];
meta = { meta = {
@ -2531,10 +2539,10 @@
elpaBuild { elpaBuild {
pname = "eev"; pname = "eev";
ename = "eev"; ename = "eev";
version = "20241002"; version = "20241123";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/eev-20241002.tar"; url = "https://elpa.gnu.org/packages/eev-20241123.tar";
sha256 = "0cl65zxryr6mlhbbpb9nbmabn8vnwc17vpqr7611s79jb9a7xsvf"; sha256 = "1bb2134jggj4xg49cwy8ivfb12yafxyy2p5k4rca9an3cr4s8ci7";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -2552,10 +2560,10 @@
elpaBuild { elpaBuild {
pname = "ef-themes"; pname = "ef-themes";
ename = "ef-themes"; ename = "ef-themes";
version = "1.8.0"; version = "1.9.0";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/ef-themes-1.8.0.tar"; url = "https://elpa.gnu.org/packages/ef-themes-1.9.0.tar";
sha256 = "0fv7m4cd4sdn8skx5li8g41kyjniwzfp8sn7jd9s4f7wzls5rnay"; sha256 = "03gi3gwrng9arffypmlnd96404yxac78k59q5yb1y1f8fahy199k";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -2681,10 +2689,10 @@
elpaBuild { elpaBuild {
pname = "elisa"; pname = "elisa";
ename = "elisa"; ename = "elisa";
version = "1.0.4"; version = "1.1.3";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/elisa-1.0.4.tar"; url = "https://elpa.gnu.org/packages/elisa-1.1.3.tar";
sha256 = "07f9micfp3p8r58kdnqv0pa7i8nyqaz35llahwp2jl16c63pl9wn"; sha256 = "0370gvj3r701i2acp3wq705a9n534g719nzz8bg9a4lry76f2crv";
}; };
packageRequires = [ packageRequires = [
async async
@ -2727,19 +2735,21 @@
lib, lib,
llm, llm,
spinner, spinner,
transient,
}: }:
elpaBuild { elpaBuild {
pname = "ellama"; pname = "ellama";
ename = "ellama"; ename = "ellama";
version = "0.11.14"; version = "0.13.0";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/ellama-0.11.14.tar"; url = "https://elpa.gnu.org/packages/ellama-0.13.0.tar";
sha256 = "1xd1pj02kgz83wsvygi5p7hlzx2898d38jmwq899qzpjn80jajb1"; sha256 = "0wfn8fv124qxf9yxl4lsa3hwlicmaiv2zzn8w4vhmlni1kf37nlw";
}; };
packageRequires = [ packageRequires = [
compat compat
llm llm
spinner spinner
transient
]; ];
meta = { meta = {
homepage = "https://elpa.gnu.org/packages/ellama.html"; homepage = "https://elpa.gnu.org/packages/ellama.html";
@ -2866,10 +2876,10 @@
elpaBuild { elpaBuild {
pname = "emms"; pname = "emms";
ename = "emms"; ename = "emms";
version = "20.1"; version = "20.2";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/emms-20.1.tar"; url = "https://elpa.gnu.org/packages/emms-20.2.tar";
sha256 = "0h0v31f1q7k45k8s9kncvim3a7np7fgjz4qg9v8gjc5ag01dzwkx"; sha256 = "0amc956amyfsjlq5aqc7nk2cs2ph2zcpci5wkms6w973wx67z2j6";
}; };
packageRequires = [ packageRequires = [
cl-lib cl-lib
@ -3836,10 +3846,10 @@
elpaBuild { elpaBuild {
pname = "gtags-mode"; pname = "gtags-mode";
ename = "gtags-mode"; ename = "gtags-mode";
version = "1.8.1"; version = "1.8.2";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/gtags-mode-1.8.1.tar"; url = "https://elpa.gnu.org/packages/gtags-mode-1.8.2.tar";
sha256 = "1n4mc33hz12p0fljrs4big317148272vz2zn16n98sakpv7jk4b6"; sha256 = "1lmaaqlklsifjzagi3miplr17vmzqjzglbkxccffj50mi6y5w4cs";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -4099,10 +4109,10 @@
elpaBuild { elpaBuild {
pname = "indent-bars"; pname = "indent-bars";
ename = "indent-bars"; ename = "indent-bars";
version = "0.8"; version = "0.8.2";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/indent-bars-0.8.tar"; url = "https://elpa.gnu.org/packages/indent-bars-0.8.2.tar";
sha256 = "0sy34xkghlwndyrismdrrsgnsz2901j8pdpfy8drbka6x4g6x36k"; sha256 = "1bhdrykkklsscgiz3p29x8kdkw0kbc4mlpnhxghvphx159clhgym";
}; };
packageRequires = [ compat ]; packageRequires = [ compat ];
meta = { meta = {
@ -4605,10 +4615,10 @@
elpaBuild { elpaBuild {
pname = "kubed"; pname = "kubed";
ename = "kubed"; ename = "kubed";
version = "0.4.1"; version = "0.4.2";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/kubed-0.4.1.tar"; url = "https://elpa.gnu.org/packages/kubed-0.4.2.tar";
sha256 = "1p0r6jcwydh25ff613imr49yjw4hhy9wcxlzxrk3d2szipj4q8hs"; sha256 = "0qbc8cw8a823dhqa34xhbf3mdbdihzdg1v0ya7ykm3789c2dhddb";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -4857,16 +4867,22 @@
fetchurl, fetchurl,
lib, lib,
plz, plz,
plz-event-source,
plz-media-type,
}: }:
elpaBuild { elpaBuild {
pname = "llm"; pname = "llm";
ename = "llm"; ename = "llm";
version = "0.17.4"; version = "0.19.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/llm-0.17.4.tar"; url = "https://elpa.gnu.org/packages/llm-0.19.1.tar";
sha256 = "01a4vnbffrh53q1j2if63a05j4859rzrrf7p3fisfbfj1cr2ywvw"; sha256 = "03f8yvnq1n2pns62iji2iz50f30wxw50n9a6cxgd9p2vkd4pjb0g";
}; };
packageRequires = [ plz ]; packageRequires = [
plz
plz-event-source
plz-media-type
];
meta = { meta = {
homepage = "https://elpa.gnu.org/packages/llm.html"; homepage = "https://elpa.gnu.org/packages/llm.html";
license = lib.licenses.free; license = lib.licenses.free;
@ -5148,6 +5164,27 @@
}; };
} }
) { }; ) { };
mathjax = callPackage (
{
elpaBuild,
fetchurl,
lib,
}:
elpaBuild {
pname = "mathjax";
ename = "mathjax";
version = "0.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/mathjax-0.1.tar";
sha256 = "16023kbzkc2v455bx7l4pfy3j7z1iba7rpv0ykzk2rz21i4jan7w";
};
packageRequires = [ ];
meta = {
homepage = "https://elpa.gnu.org/packages/mathjax.html";
license = lib.licenses.free;
};
}
) { };
mct = callPackage ( mct = callPackage (
{ {
elpaBuild, elpaBuild,
@ -5349,10 +5386,10 @@
elpaBuild { elpaBuild {
pname = "modus-themes"; pname = "modus-themes";
ename = "modus-themes"; ename = "modus-themes";
version = "4.5.0"; version = "4.6.0";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/modus-themes-4.5.0.tar"; url = "https://elpa.gnu.org/packages/modus-themes-4.6.0.tar";
sha256 = "1f75rkl6bvqsc2s4fz67rk3h3fl9qw4vay0dj1agas4x0zskm89v"; sha256 = "19hg2gqpa19rnlj0pn7v8sd52q5mkinf39l7rb0a6xqbkfzqvsnd";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -5777,10 +5814,10 @@
elpaBuild { elpaBuild {
pname = "ob-asymptote"; pname = "ob-asymptote";
ename = "ob-asymptote"; ename = "ob-asymptote";
version = "1.0"; version = "1.0.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/ob-asymptote-1.0.tar"; url = "https://elpa.gnu.org/packages/ob-asymptote-1.0.1.tar";
sha256 = "1hmqbkrqg18w454xg37rg5cg0q3vd0b0fm14n5chihqrwwnwrf4l"; sha256 = "0f1vpq691pna1p1lgqw2nzmdw25sjsmpcvgm2lj7n14kg7dizxal";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -5927,10 +5964,10 @@
elpaBuild { elpaBuild {
pname = "org"; pname = "org";
ename = "org"; ename = "org";
version = "9.7.12"; version = "9.7.16";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/org-9.7.12.tar"; url = "https://elpa.gnu.org/packages/org-9.7.16.tar";
sha256 = "0v0mims57k5ffaf9i8szmrq3zvk3zd7xz7386k8lwc58mmhhdw15"; sha256 = "1d6vxd7ssfb1v00a37dr723v9cg8i8v78lcymqndqhy6f2ji1f06";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -6516,10 +6553,10 @@
elpaBuild { elpaBuild {
pname = "plz-media-type"; pname = "plz-media-type";
ename = "plz-media-type"; ename = "plz-media-type";
version = "0.2.1"; version = "0.2.2";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/plz-media-type-0.2.1.tar"; url = "https://elpa.gnu.org/packages/plz-media-type-0.2.2.tar";
sha256 = "05hr78iw9s34vf2lpyh79xfnd4gs4q07rha1ahdrmxvkk9mnmk90"; sha256 = "0m1hm2myc5pqax8kkz910wn3443pxdsav7rcf7bcqnim4l0ismvn";
}; };
packageRequires = [ plz ]; packageRequires = [ plz ];
meta = { meta = {
@ -6686,10 +6723,10 @@
elpaBuild { elpaBuild {
pname = "preview-auto"; pname = "preview-auto";
ename = "preview-auto"; ename = "preview-auto";
version = "0.3"; version = "0.4";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/preview-auto-0.3.tar"; url = "https://elpa.gnu.org/packages/preview-auto-0.4.tar";
sha256 = "19jih2bn6ac82jx6w7jhv9hbz47c8argv24lfglvv6532fda218r"; sha256 = "0jsahj6ylrs4hlr57i0ibkj9bhc3jbg84k3pk8g5rg27xiwncczy";
}; };
packageRequires = [ auctex ]; packageRequires = [ auctex ];
meta = { meta = {
@ -7010,10 +7047,10 @@
elpaBuild { elpaBuild {
pname = "rcirc-sqlite"; pname = "rcirc-sqlite";
ename = "rcirc-sqlite"; ename = "rcirc-sqlite";
version = "1.0.3"; version = "1.0.4";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/rcirc-sqlite-1.0.3.tar"; url = "https://elpa.gnu.org/packages/rcirc-sqlite-1.0.4.tar";
sha256 = "11m6n93qwfkn6jhn3vlvdz48wsqixlkbwbxsx3qdyj8jmjqpjvz6"; sha256 = "0bxih4m3rn76lq5q2hbq04fb0yqfy848cqfzl7gii1qsrfplqcal";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -8192,10 +8229,10 @@
elpaBuild { elpaBuild {
pname = "svg-tag-mode"; pname = "svg-tag-mode";
ename = "svg-tag-mode"; ename = "svg-tag-mode";
version = "0.3.2"; version = "0.3.3";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/svg-tag-mode-0.3.2.tar"; url = "https://elpa.gnu.org/packages/svg-tag-mode-0.3.3.tar";
sha256 = "0wzcq00kbjpbwz7acn4d7jd98v5kicq3iwgf6dnmz2kflvkfwkvr"; sha256 = "14vkjy3dvvvkhxi3m8d56m0dpvg9gpbwmmb0dchz8ap8wjbvc85j";
}; };
packageRequires = [ svg-lib ]; packageRequires = [ svg-lib ];
meta = { meta = {
@ -8651,10 +8688,10 @@
elpaBuild { elpaBuild {
pname = "tramp"; pname = "tramp";
ename = "tramp"; ename = "tramp";
version = "2.7.1.3"; version = "2.7.1.5";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/tramp-2.7.1.3.tar"; url = "https://elpa.gnu.org/packages/tramp-2.7.1.5.tar";
sha256 = "0ii16y283yidql05f69yx0x2jf71w8niq5k8mlrqq05z5h4h3sw3"; sha256 = "11a2zyk0d1y9bxhdqfzcx4ynazfs6hb3mdgpz5kp9p3lk8l6bz5g";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -8737,10 +8774,10 @@
elpaBuild { elpaBuild {
pname = "transient"; pname = "transient";
ename = "transient"; ename = "transient";
version = "0.7.7"; version = "0.7.9";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/transient-0.7.7.tar"; url = "https://elpa.gnu.org/packages/transient-0.7.9.tar";
sha256 = "07c1n76nlchm5pp74hnx7bkwiibpal1ajdkmj559ja3099rgghkx"; sha256 = "07d5pzd7nalnjxn6wpj6vpfg8pldnwh69l85immmiww03vl8ngrf";
}; };
packageRequires = [ packageRequires = [
compat compat
@ -8831,10 +8868,10 @@
elpaBuild { elpaBuild {
pname = "triples"; pname = "triples";
ename = "triples"; ename = "triples";
version = "0.4.0"; version = "0.4.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/triples-0.4.0.tar"; url = "https://elpa.gnu.org/packages/triples-0.4.1.tar";
sha256 = "0g29i33bmh9gh4mmk92h6vhhw42k1f2ph02qlrasn0w5fq3pg8vp"; sha256 = "1x5sws7zhm9wz5d430bs8g8rnxn4y57pqkqhxcsi9d3vbs39wfn8";
}; };
packageRequires = [ seq ]; packageRequires = [ seq ];
meta = { meta = {
@ -9870,6 +9907,27 @@
}; };
} }
) { }; ) { };
yaml = callPackage (
{
elpaBuild,
fetchurl,
lib,
}:
elpaBuild {
pname = "yaml";
ename = "yaml";
version = "1.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/yaml-1.0.0.tar";
sha256 = "0yvfrijjjm17qidyi50nrsvw2m3bqw6p72za7w8v4ywxfl7b59c6";
};
packageRequires = [ ];
meta = {
homepage = "https://elpa.gnu.org/packages/yaml.html";
license = lib.licenses.free;
};
}
) { };
yasnippet = callPackage ( yasnippet = callPackage (
{ {
cl-lib ? null, cl-lib ? null,

24
pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
View file

@ -800,6 +800,18 @@ let
# depends on distel which is not on any ELPA https://github.com/massemanet/distel/issues/21 # depends on distel which is not on any ELPA https://github.com/massemanet/distel/issues/21
auto-complete-distel = ignoreCompilationError super.auto-complete-distel; auto-complete-distel = ignoreCompilationError super.auto-complete-distel;
auto-virtualenv = super.auto-virtualenv.overrideAttrs (
finalAttrs: previousAttrs: {
patches = previousAttrs.patches or [ ] ++ [
(pkgs.fetchpatch {
name = "do-not-error-if-the-optional-projectile-is-not-available.patch";
url = "https://github.com/marcwebbie/auto-virtualenv/pull/14/commits/9a068974a4e12958200c12c6a23372fa736523c1.patch";
hash = "sha256-bqrroFf5AD5SHx6uzBFdVwTv3SbFiO39T+0x03Ves/k=";
})
];
}
);
aws-ec2 = ignoreCompilationError super.aws-ec2; # elisp error aws-ec2 = ignoreCompilationError super.aws-ec2; # elisp error
badger-theme = ignoreCompilationError super.badger-theme; # elisp error badger-theme = ignoreCompilationError super.badger-theme; # elisp error
@ -1503,6 +1515,18 @@ let
scad-preview = ignoreCompilationError super.scad-preview; # elisp error scad-preview = ignoreCompilationError super.scad-preview; # elisp error
sdml-mode = super.sdml-mode.overrideAttrs (
finalAttrs: previousAttrs: {
patches = previousAttrs.patches or [ ] ++ [
(pkgs.fetchpatch {
name = "make-pretty-hydra-optional.patch";
url = "https://github.com/sdm-lang/emacs-sdml-mode/pull/3/commits/2368afe31c72073488411540e212c70aae3dd468.patch";
hash = "sha256-Wc4pquKV9cTRey9SdjY++UgcP+pGI0hVOOn1Cci8dpk=";
})
];
}
);
# https://github.com/wanderlust/semi/pull/29 # https://github.com/wanderlust/semi/pull/29
# missing optional dependencies # missing optional dependencies
semi = addPackageRequires super.semi [ self.bbdb-vcard ]; semi = addPackageRequires super.semi [ self.bbdb-vcard ];

430
pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
View file

@ -93,10 +93,10 @@
elpaBuild { elpaBuild {
pname = "annotate"; pname = "annotate";
ename = "annotate"; ename = "annotate";
version = "2.2.2.0.20240509.114401"; version = "2.2.3.0.20241017.150805";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/annotate-2.2.2.0.20240509.114401.tar"; url = "https://elpa.nongnu.org/nongnu-devel/annotate-2.2.3.0.20241017.150805.tar";
sha256 = "0b78ilx6qwn2g0l6c1fn3vrm6bc2dgylpj8vm2wxwqyx621rf513"; sha256 = "19m3xg2yhf9gxyvp3n143dkyb6r592b2bv7sxcj4g8fhm7qlj6jc";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -177,10 +177,10 @@
elpaBuild { elpaBuild {
pname = "apropospriate-theme"; pname = "apropospriate-theme";
ename = "apropospriate-theme"; ename = "apropospriate-theme";
version = "0.2.0.0.20240921.102210"; version = "0.2.0.0.20241118.190153";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/apropospriate-theme-0.2.0.0.20240921.102210.tar"; url = "https://elpa.nongnu.org/nongnu-devel/apropospriate-theme-0.2.0.0.20241118.190153.tar";
sha256 = "04x4s341lvygxxnjq3wjy8sp8p9y66kx3csklp46x33qyqbbdx82"; sha256 = "0nqnf57bf21wg2vlw85msg927618hhsn4qfwd60vrx70260432kf";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -284,10 +284,10 @@
elpaBuild { elpaBuild {
pname = "bash-completion"; pname = "bash-completion";
ename = "bash-completion"; ename = "bash-completion";
version = "3.1.1.0.20240914.174817"; version = "3.1.1.0.20241118.194353";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/bash-completion-3.1.1.0.20240914.174817.tar"; url = "https://elpa.nongnu.org/nongnu-devel/bash-completion-3.1.1.0.20241118.194353.tar";
sha256 = "1s5wx8374naay0silh95vlci5qrxxz04av4f5iz94iwvi6jz0fa0"; sha256 = "10cirfnwz34yc7glf1xzshq3926jdwdf3s7bdarykrkxmsrha4f7";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -544,10 +544,10 @@
elpaBuild { elpaBuild {
pname = "cider"; pname = "cider";
ename = "cider"; ename = "cider";
version = "1.16.0.0.20240925.134028"; version = "1.16.1.0.20241203.160720";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/cider-1.16.0.0.20240925.134028.tar"; url = "https://elpa.nongnu.org/nongnu-devel/cider-1.16.1.0.20241203.160720.tar";
sha256 = "1j874gyrdiy90f8hlxjkvxjdwzs8pixi19l28d009npj69mv0f6n"; sha256 = "0b6nqhg5c0ny8ilm4653c7pd34aj02bh6ya9bzc9swdpyq7pwnqr";
}; };
packageRequires = [ packageRequires = [
clojure-mode clojure-mode
@ -573,10 +573,10 @@
elpaBuild { elpaBuild {
pname = "clojure-mode"; pname = "clojure-mode";
ename = "clojure-mode"; ename = "clojure-mode";
version = "5.20.0snapshot0.20240611.73422"; version = "5.20.0snapshot0.20241125.112305";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/clojure-mode-5.20.0snapshot0.20240611.73422.tar"; url = "https://elpa.nongnu.org/nongnu-devel/clojure-mode-5.20.0snapshot0.20241125.112305.tar";
sha256 = "1jlmg2f4gvxqknyw5lqs7aqaar0ghw21hqphsmcvakpcn7d0nqiz"; sha256 = "0hh17w63j5x4687kbd2vmlj9qs468ivq54mwwcm6p43wr7rvk2cj";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -594,10 +594,10 @@
elpaBuild { elpaBuild {
pname = "clojure-ts-mode"; pname = "clojure-ts-mode";
ename = "clojure-ts-mode"; ename = "clojure-ts-mode";
version = "0.2.2.0.20240930.131600"; version = "0.2.2.0.20241104.213550";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.2.2.0.20240930.131600.tar"; url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.2.2.0.20241104.213550.tar";
sha256 = "0qs76xj2fjhp42882ay1sg7ihzanzdh8mq4yffmqj1ljhkdyxsxc"; sha256 = "0b37iccwh8l6z0q3ls3ysfy7pjp8q52kbiw4lipjgljg0lmj5lsv";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -638,10 +638,10 @@
elpaBuild { elpaBuild {
pname = "consult-flycheck"; pname = "consult-flycheck";
ename = "consult-flycheck"; ename = "consult-flycheck";
version = "1.0.0.20240926.91748"; version = "1.0.0.20241114.112007";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck-1.0.0.20240926.91748.tar"; url = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck-1.0.0.20241114.112007.tar";
sha256 = "1f5869y8614hv91f3sc7i10wr3393mygz841crw4an4m03kxkq7f"; sha256 = "1jzli50sjr8pv2j9qg7glxdgm54sx2yw6xr7ka738gisa1r0iscl";
}; };
packageRequires = [ packageRequires = [
consult consult
@ -710,10 +710,10 @@
elpaBuild { elpaBuild {
pname = "csv2ledger"; pname = "csv2ledger";
ename = "csv2ledger"; ename = "csv2ledger";
version = "1.5.4.0.20240605.63224"; version = "1.5.4.0.20241109.230511";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/csv2ledger-1.5.4.0.20240605.63224.tar"; url = "https://elpa.nongnu.org/nongnu-devel/csv2ledger-1.5.4.0.20241109.230511.tar";
sha256 = "0vh626mic3nd4ci7hc1ci8rmfh3k6frh8azgkj4784n3nhgr18h8"; sha256 = "1ank47lk4qgmbgr7qb9fgkramc7qngs93rq0rnlvkdh2fm198ywj";
}; };
packageRequires = [ csv-mode ]; packageRequires = [ csv-mode ];
meta = { meta = {
@ -774,10 +774,10 @@
elpaBuild { elpaBuild {
pname = "d-mode"; pname = "d-mode";
ename = "d-mode"; ename = "d-mode";
version = "202408131340.0.20240813.65913"; version = "202408131340.0.20241126.105644";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/d-mode-202408131340.0.20240813.65913.tar"; url = "https://elpa.nongnu.org/nongnu-devel/d-mode-202408131340.0.20241126.105644.tar";
sha256 = "1lf78x8bkb41mr5p8api0f447z9k5yd2v9w97qw6l4dxcj2dldv5"; sha256 = "11hc3dyxyr1pcq25jvw9x3ys4v73rbqw9p19s4i59p9mdb0bnxpy";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -892,6 +892,28 @@
}; };
} }
) { }; ) { };
dirvish = callPackage (
{
elpaBuild,
fetchurl,
lib,
transient,
}:
elpaBuild {
pname = "dirvish";
ename = "dirvish";
version = "2.0.53.0.20230519.150010";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/dirvish-2.0.53.0.20230519.150010.tar";
sha256 = "0n73giyvg244s0cxfrkc3j0jrq20bs1zili6liab0s3ks02kvqdg";
};
packageRequires = [ transient ];
meta = {
homepage = "https://elpa.nongnu.org/nongnu-devel/dirvish.html";
license = lib.licenses.free;
};
}
) { };
doc-show-inline = callPackage ( doc-show-inline = callPackage (
{ {
elpaBuild, elpaBuild,
@ -943,10 +965,10 @@
elpaBuild { elpaBuild {
pname = "dracula-theme"; pname = "dracula-theme";
ename = "dracula-theme"; ename = "dracula-theme";
version = "1.8.2.0.20240912.203213"; version = "1.8.2.0.20241102.130126";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/dracula-theme-1.8.2.0.20240912.203213.tar"; url = "https://elpa.nongnu.org/nongnu-devel/dracula-theme-1.8.2.0.20241102.130126.tar";
sha256 = "1wkyn7wswrgda7y267mxb6bi0h5ywp7hh2d4cmz3yfglnq1pmp1g"; sha256 = "01f3g7cy9snm4f2b2rx7zd82kwxzlf9g0wapwa83k3i60p23rf5s";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -986,10 +1008,10 @@
elpaBuild { elpaBuild {
pname = "dslide"; pname = "dslide";
ename = "dslide"; ename = "dslide";
version = "0.5.3.0.20240704.131127"; version = "0.5.5.0.20241128.111432";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/dslide-0.5.3.0.20240704.131127.tar"; url = "https://elpa.nongnu.org/nongnu-devel/dslide-0.5.5.0.20241128.111432.tar";
sha256 = "0mr4p3w5932bz9cj9b4b2lmp5dkrix79s6vf4s2h2rr8cjhgbb6s"; sha256 = "1d2rsqzn8w6w3qvsfsgpmjwn53nsj30jivli02d7n24q30pxzpv6";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -1050,10 +1072,10 @@
elpaBuild { elpaBuild {
pname = "editorconfig"; pname = "editorconfig";
ename = "editorconfig"; ename = "editorconfig";
version = "0.11.0.0.20240813.80135"; version = "0.11.0.0.20241027.181535";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/editorconfig-0.11.0.0.20240813.80135.tar"; url = "https://elpa.nongnu.org/nongnu-devel/editorconfig-0.11.0.0.20241027.181535.tar";
sha256 = "1ak09a6ay4234x4x9b8k6mqayb99129yk0p45iv782xsyc9r05h8"; sha256 = "17vx1rf8dnyfkj1c7cv2zw9kvrc9cllm3wr4r0wik31xrkw7zpdj";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -1092,10 +1114,10 @@
elpaBuild { elpaBuild {
pname = "elpher"; pname = "elpher";
ename = "elpher"; ename = "elpher";
version = "3.6.3.0.20240930.91332"; version = "3.6.4.0.20241022.162545";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/elpher-3.6.3.0.20240930.91332.tar"; url = "https://elpa.nongnu.org/nongnu-devel/elpher-3.6.4.0.20241022.162545.tar";
sha256 = "1mf0d6gzykvpyjk2kxivlqs5xwxqdsxj9adfi92bna01dv5vrj3n"; sha256 = "070njpzhspzgpry9wy69l76kmfdwzy8c5nx32kr0isx7b6qzvb5v";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -1113,10 +1135,10 @@
elpaBuild { elpaBuild {
pname = "emacsql"; pname = "emacsql";
ename = "emacsql"; ename = "emacsql";
version = "4.0.3.0.20240906.134234"; version = "4.1.0.0.20241201.155153";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/emacsql-4.0.3.0.20240906.134234.tar"; url = "https://elpa.nongnu.org/nongnu-devel/emacsql-4.1.0.0.20241201.155153.tar";
sha256 = "0a9456snizy8w47vh8zj00180kncg0h3vv3iq86lckqhv2qbp0az"; sha256 = "10sqyqba0jsf1w6i7x77vxgj13wjzr3k9bcpzmzxhqgprakndixy";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -1385,10 +1407,10 @@
elpaBuild { elpaBuild {
pname = "evil-matchit"; pname = "evil-matchit";
ename = "evil-matchit"; ename = "evil-matchit";
version = "3.0.4.0.20240418.73107"; version = "3.0.4.0.20241111.120111";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/evil-matchit-3.0.4.0.20240418.73107.tar"; url = "https://elpa.nongnu.org/nongnu-devel/evil-matchit-3.0.4.0.20241111.120111.tar";
sha256 = "01fsamf87a35xmw03b93yvvlkz2mi7xg9pblzakacwfnwksxr76i"; sha256 = "1jv7rs102i00kwdkj1n3l0j9as0kbrylhkkn2rrgwv9b97lmlirs";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -1428,10 +1450,10 @@
elpaBuild { elpaBuild {
pname = "evil-numbers"; pname = "evil-numbers";
ename = "evil-numbers"; ename = "evil-numbers";
version = "0.7.0.20240416.14058"; version = "0.7.0.20241204.12906";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/evil-numbers-0.7.0.20240416.14058.tar"; url = "https://elpa.nongnu.org/nongnu-devel/evil-numbers-0.7.0.20241204.12906.tar";
sha256 = "1xn9r9iycrha64n379q8kqdbywcfqcwc9qqlnxi268rcxzsq99rx"; sha256 = "1r4ic5db8vl3mslp48w8lqx904raxi8lzp512jcjv21vs36gjl97";
}; };
packageRequires = [ evil ]; packageRequires = [ evil ];
meta = { meta = {
@ -1519,10 +1541,10 @@
elpaBuild { elpaBuild {
pname = "exec-path-from-shell"; pname = "exec-path-from-shell";
ename = "exec-path-from-shell"; ename = "exec-path-from-shell";
version = "2.2.0.20240411.85903"; version = "2.2.0.20241107.71915";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/exec-path-from-shell-2.2.0.20240411.85903.tar"; url = "https://elpa.nongnu.org/nongnu-devel/exec-path-from-shell-2.2.0.20241107.71915.tar";
sha256 = "1z8dxx8x87ndx4mfq2nhj2q6m0h5zd2v80pbwxirz4qnvivqspgv"; sha256 = "17wyy2agi9j7vny0wdi5mxp1nz7zpzi6ayx55ls1cdxwd7v2jyvf";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -1588,10 +1610,10 @@
elpaBuild { elpaBuild {
pname = "flycheck"; pname = "flycheck";
ename = "flycheck"; ename = "flycheck";
version = "35.0snapshot0.20240726.45656"; version = "35.0snapshot0.20241130.150233";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/flycheck-35.0snapshot0.20240726.45656.tar"; url = "https://elpa.nongnu.org/nongnu-devel/flycheck-35.0snapshot0.20241130.150233.tar";
sha256 = "09hy61g6rcvl1xng2bnav9x58rg0ddq39mj4gicsyyxyqfyp2gc7"; sha256 = "08viqbba50alfj3783ykymjqwpi08si6bi411sm29gagga1cjxr6";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -1681,10 +1703,10 @@
elpaBuild { elpaBuild {
pname = "focus"; pname = "focus";
ename = "focus"; ename = "focus";
version = "1.0.1.0.20240528.90117"; version = "1.0.1.0.20241029.150652";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/focus-1.0.1.0.20240528.90117.tar"; url = "https://elpa.nongnu.org/nongnu-devel/focus-1.0.1.0.20241029.150652.tar";
sha256 = "0krfsxswwjzajxzr6kjxnkmzgi5nysnwa1yrhd205z1spb36i9i0"; sha256 = "08ryv68xfvlgbsyq80r9bycj4d9dbdz0v7ipdgjxnxfkp3di2s01";
}; };
packageRequires = [ cl-lib ]; packageRequires = [ cl-lib ];
meta = { meta = {
@ -1834,10 +1856,10 @@
elpaBuild { elpaBuild {
pname = "geiser-chicken"; pname = "geiser-chicken";
ename = "geiser-chicken"; ename = "geiser-chicken";
version = "0.17.0.20220717.113055"; version = "0.17.0.20241204.11932";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/geiser-chicken-0.17.0.20220717.113055.tar"; url = "https://elpa.nongnu.org/nongnu-devel/geiser-chicken-0.17.0.20241204.11932.tar";
sha256 = "1ajdmkykm23rxcnsbqadc39h72r30cdqzhxasq9s5hnnpk8qmyxk"; sha256 = "1l95d72wl74mlfa50m9m999skj993vqdmm13qm42n0lp0y9ndvyf";
}; };
packageRequires = [ geiser ]; packageRequires = [ geiser ];
meta = { meta = {
@ -2068,10 +2090,10 @@
elpaBuild { elpaBuild {
pname = "gnosis"; pname = "gnosis";
ename = "gnosis"; ename = "gnosis";
version = "0.4.5.0.20241009.160730"; version = "0.4.8.0.20241115.104152";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/gnosis-0.4.5.0.20241009.160730.tar"; url = "https://elpa.nongnu.org/nongnu-devel/gnosis-0.4.8.0.20241115.104152.tar";
sha256 = "0kmmxhbmxi7l1ig01b2v36diidlz0192y8nxjr3znycx0qzdbn7x"; sha256 = "143pmwp5g2wzmmhmbwc1q6hhf86j1cywi8x2hzvlq0p5mhkkilr1";
}; };
packageRequires = [ packageRequires = [
compat compat
@ -2242,10 +2264,10 @@
elpaBuild { elpaBuild {
pname = "gptel"; pname = "gptel";
ename = "gptel"; ename = "gptel";
version = "0.9.5.0.20241013.125757"; version = "0.9.6.0.20241202.163036";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.5.0.20241013.125757.tar"; url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.6.0.20241202.163036.tar";
sha256 = "123bvwfh6anp6arwznzinyckakpadagz6pn7381848k9zp5xz6lg"; sha256 = "0zlfrnp01hb6syrkgkwfi1hjxm9l4j9sqrwn7a8nmk5wlw4bi6xm";
}; };
packageRequires = [ packageRequires = [
compat compat
@ -2266,10 +2288,10 @@
elpaBuild { elpaBuild {
pname = "graphql-mode"; pname = "graphql-mode";
ename = "graphql-mode"; ename = "graphql-mode";
version = "1.0.0.0.20240918.121927"; version = "1.0.0.0.20241020.75405";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/graphql-mode-1.0.0.0.20240918.121927.tar"; url = "https://elpa.nongnu.org/nongnu-devel/graphql-mode-1.0.0.0.20241020.75405.tar";
sha256 = "198kbpazgczyb0qjclm8xgaha6wh6spr8ybvrbhm6nsf90zgv5kw"; sha256 = "0bds1zv0syg1jfdak2hk3kank4c532r6ki095wamxy06rwdbm2il";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -2373,10 +2395,10 @@
elpaBuild { elpaBuild {
pname = "haskell-mode"; pname = "haskell-mode";
ename = "haskell-mode"; ename = "haskell-mode";
version = "17.5.0.20241007.132004"; version = "17.5.0.20241111.151419";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20241007.132004.tar"; url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20241111.151419.tar";
sha256 = "1dj72kjy3jjxbfxxhj27yspc7n0059p7bxrv66hrzb0iginip45f"; sha256 = "1pshx7i45smkwg09w2am9q87iqawfds2nn48jczdyxh6bnk558zz";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -2416,10 +2438,10 @@
elpaBuild { elpaBuild {
pname = "haskell-ts-mode"; pname = "haskell-ts-mode";
ename = "haskell-ts-mode"; ename = "haskell-ts-mode";
version = "1.0.20240925.24042"; version = "1.0.20241108.150811";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.0.20240925.24042.tar"; url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.0.20241108.150811.tar";
sha256 = "1kkfg9b0cfa2ygxkp5da98sc0w2b8q2q99rcfdqm00i8l6lj5wm9"; sha256 = "1ycbcwhj9j77jgpb3ag7hy8474qdj4rzzg7z5z79f0fqvlnv94m7";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -2439,10 +2461,10 @@
elpaBuild { elpaBuild {
pname = "helm"; pname = "helm";
ename = "helm"; ename = "helm";
version = "4.0.0.20240929.41608"; version = "4.0.0.20241204.51511";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.0.20240929.41608.tar"; url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.0.20241204.51511.tar";
sha256 = "1xf7nbnd2399cz2qkpvb0h38cdwx76jk9sq9wk67y6l23kvqh0sr"; sha256 = "1dzc1jg6p9r589mzwdzhlhj58239ssy85mz27kwr7yyg36cz3m3l";
}; };
packageRequires = [ packageRequires = [
helm-core helm-core
@ -2464,10 +2486,10 @@
elpaBuild { elpaBuild {
pname = "helm-core"; pname = "helm-core";
ename = "helm-core"; ename = "helm-core";
version = "4.0.0.20240929.41608"; version = "4.0.0.20241204.51511";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.0.20240929.41608.tar"; url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.0.20241204.51511.tar";
sha256 = "0lfk8hamfbaz0ifs4fkl836dqlcyw4g7kbsnmi5qjlyqc27yk8f9"; sha256 = "1xvx1x6p7r1ak40n3740q9iyah2d1npqg7aw1zybshcrai5bm9jm";
}; };
packageRequires = [ async ]; packageRequires = [ async ];
meta = { meta = {
@ -2597,10 +2619,10 @@
elpaBuild { elpaBuild {
pname = "hyperdrive"; pname = "hyperdrive";
ename = "hyperdrive"; ename = "hyperdrive";
version = "0.5pre0.20241012.232703"; version = "0.5pre0.20241106.231359";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.5pre0.20241012.232703.tar"; url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.5pre0.20241106.231359.tar";
sha256 = "1wj52cs86jzl2cx9a3599fjncnra1x8as9md6i5afwmm9flb3yn6"; sha256 = "11b3dvwzrsgg2nj3kasgrz5bwhd2i3ig4v9blzlzhyybw6wy0i1f";
}; };
packageRequires = [ packageRequires = [
compat compat
@ -2628,10 +2650,10 @@
elpaBuild { elpaBuild {
pname = "hyperdrive-org-transclusion"; pname = "hyperdrive-org-transclusion";
ename = "hyperdrive-org-transclusion"; ename = "hyperdrive-org-transclusion";
version = "0.3pre0.20240930.224512"; version = "0.3.1.0.20241027.212737";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-org-transclusion-0.3pre0.20240930.224512.tar"; url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-org-transclusion-0.3.1.0.20241027.212737.tar";
sha256 = "13wacgy29zm9yly58hznj0k1liah9kqw2b6gkpk8804yrjzjhgd4"; sha256 = "1lwiqhjlanxkbv556m6f8xfp63b5xk66zhmg2zazw4sx0zy97s75";
}; };
packageRequires = [ packageRequires = [
hyperdrive hyperdrive
@ -2873,10 +2895,10 @@
elpaBuild { elpaBuild {
pname = "julia-mode"; pname = "julia-mode";
ename = "julia-mode"; ename = "julia-mode";
version = "1.0.0.0.20240926.152808"; version = "1.0.1.0.20241120.85729";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/julia-mode-1.0.0.0.20240926.152808.tar"; url = "https://elpa.nongnu.org/nongnu-devel/julia-mode-1.0.1.0.20241120.85729.tar";
sha256 = "0hhpzarz8xa61mp6drm0j98832h8sdammkp55ap6bj35vlyppc13"; sha256 = "0a6xi5zcq1nfbsjqk84x6avlrzbjdh6fbq1h6jkqcczy7mm5rg5h";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -2981,10 +3003,10 @@
elpaBuild { elpaBuild {
pname = "macrostep"; pname = "macrostep";
ename = "macrostep"; ename = "macrostep";
version = "0.9.4.0.20240608.12616"; version = "0.9.4.0.20241025.145629";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/macrostep-0.9.4.0.20240608.12616.tar"; url = "https://elpa.nongnu.org/nongnu-devel/macrostep-0.9.4.0.20241025.145629.tar";
sha256 = "0wl8v174428vaxzf9ghyzm1ljsv0r5xw445lwzzj21yc4x1y2vh1"; sha256 = "1xbi45ymsqc2vbhl1s3wphirgqz5ky9880fzr949bhd0ff18bw6x";
}; };
packageRequires = [ packageRequires = [
cl-lib cl-lib
@ -3011,10 +3033,10 @@
elpaBuild { elpaBuild {
pname = "magit"; pname = "magit";
ename = "magit"; ename = "magit";
version = "4.1.1.0.20241001.205222"; version = "4.1.2.0.20241102.130025";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/magit-4.1.1.0.20241001.205222.tar"; url = "https://elpa.nongnu.org/nongnu-devel/magit-4.1.2.0.20241102.130025.tar";
sha256 = "1qfaaqhm8m7cg4lrllv770w7bl2mfnpyx551accw757jxpnw8qdn"; sha256 = "1y3fr2qj8a1h7hkrh47zshbmrcfxhw6i8wiqcrrba7ypnas53gcg";
}; };
packageRequires = [ packageRequires = [
compat compat
@ -3042,10 +3064,10 @@
elpaBuild { elpaBuild {
pname = "magit-section"; pname = "magit-section";
ename = "magit-section"; ename = "magit-section";
version = "4.1.1.0.20241001.205222"; version = "4.1.2.0.20241102.130025";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.1.1.0.20241001.205222.tar"; url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.1.2.0.20241102.130025.tar";
sha256 = "1lad3vqflf4fdsjfiyarjgcl7w73k8rj0bbsndc3xd6j5q53azfr"; sha256 = "1cnpklpsvbsi1wsmfbp5m8379cbr6jdifxm07zj4hnvi8lyr49vn";
}; };
packageRequires = [ packageRequires = [
compat compat
@ -3067,10 +3089,10 @@
elpaBuild { elpaBuild {
pname = "markdown-mode"; pname = "markdown-mode";
ename = "markdown-mode"; ename = "markdown-mode";
version = "2.7alpha0.20240829.32430"; version = "2.7alpha0.20241203.113852";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.7alpha0.20240829.32430.tar"; url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.7alpha0.20241203.113852.tar";
sha256 = "0npgvcni0h5nr253fsn0d1cm3fnq1s662ba7aa23vsvkyk1x54d9"; sha256 = "14kkg7wj6qkq84jsa5cdwc7i7lqvilx21nb9lyddqxqxm8h7sld8";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -3086,18 +3108,20 @@
lib, lib,
persist, persist,
request, request,
tp,
}: }:
elpaBuild { elpaBuild {
pname = "mastodon"; pname = "mastodon";
ename = "mastodon"; ename = "mastodon";
version = "1.0.27.0.20240920.183931"; version = "1.1.7.0.20241202.183936";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.0.27.0.20240920.183931.tar"; url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.1.7.0.20241202.183936.tar";
sha256 = "0wy6ibdbj984aycscvsg24k4z3a0dlzi2ghbvrb8zq3lma8sy2a6"; sha256 = "08683fah6xkfzgxi6si4qgl4mxccczj4dcaivif1qlhfrc3bh66f";
}; };
packageRequires = [ packageRequires = [
persist persist
request request
tp
]; ];
meta = { meta = {
homepage = "https://elpa.nongnu.org/nongnu-devel/mastodon.html"; homepage = "https://elpa.nongnu.org/nongnu-devel/mastodon.html";
@ -3165,10 +3189,10 @@
elpaBuild { elpaBuild {
pname = "meow"; pname = "meow";
ename = "meow"; ename = "meow";
version = "1.4.5.0.20241014.63605"; version = "1.5.0.0.20241203.160407";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/meow-1.4.5.0.20241014.63605.tar"; url = "https://elpa.nongnu.org/nongnu-devel/meow-1.5.0.0.20241203.160407.tar";
sha256 = "1ws4i72gmr6g8fxvc27p28rm6wjdm71xpi03xiwy33x7m960g470"; sha256 = "0a3zdx91j5q0mllm71951392hgnn5q9l960qs2lazs8plpv4pn9f";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -3249,10 +3273,10 @@
elpaBuild { elpaBuild {
pname = "mpv"; pname = "mpv";
ename = "mpv"; ename = "mpv";
version = "0.2.0.0.20220801.191738"; version = "0.2.0.0.20241121.230837";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/mpv-0.2.0.0.20220801.191738.tar"; url = "https://elpa.nongnu.org/nongnu-devel/mpv-0.2.0.0.20241121.230837.tar";
sha256 = "0fanxxgmpjmy13lawr15ccnlzc5k89pix6m020kxbpi6aj2n1apc"; sha256 = "1aynlwp90xrprri3m1v8yxa5zvbx6d12m662lsn9qdzvhl2dy5hk";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -3270,10 +3294,10 @@
elpaBuild { elpaBuild {
pname = "multiple-cursors"; pname = "multiple-cursors";
ename = "multiple-cursors"; ename = "multiple-cursors";
version = "1.4.0.0.20240223.113445"; version = "1.4.0.0.20241202.163103";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/multiple-cursors-1.4.0.0.20240223.113445.tar"; url = "https://elpa.nongnu.org/nongnu-devel/multiple-cursors-1.4.0.0.20241202.163103.tar";
sha256 = "17wq8apfvcrmx4mvyw2pbkp9jg5c960w8j81blzxq1qxh1ggdv3z"; sha256 = "018f3fpv0ganvhcwykpb2rfw41nqlkj87dx1zfzkf7s9011grkfv";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -3424,10 +3448,10 @@
elpaBuild { elpaBuild {
pname = "org-contrib"; pname = "org-contrib";
ename = "org-contrib"; ename = "org-contrib";
version = "0.6.0.20240907.102556"; version = "0.6.0.20241029.204012";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/org-contrib-0.6.0.20240907.102556.tar"; url = "https://elpa.nongnu.org/nongnu-devel/org-contrib-0.6.0.20241029.204012.tar";
sha256 = "16dv65jz0ykzi0dk2zd1gj46113wq1bnzxzbacpbddix53vkfbc1"; sha256 = "12pfmv5ns5igdvc06glcc8nxqcj7lwjqc3s86720ys57y4py566w";
}; };
packageRequires = [ org ]; packageRequires = [ org ];
meta = { meta = {
@ -3657,10 +3681,10 @@
elpaBuild { elpaBuild {
pname = "package-lint"; pname = "package-lint";
ename = "package-lint"; ename = "package-lint";
version = "0.24.0.20241007.131950"; version = "0.24.0.20241127.182614";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.24.0.20241007.131950.tar"; url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.24.0.20241127.182614.tar";
sha256 = "1srjs8xwwiqzjh550snzk0yzd4vy3ynk0d3i41y2i7wgfdggyl0p"; sha256 = "0wlz1hc387jcbh75hqjkxmydlsl0ai2adiam2axmqfdfn5p68llq";
}; };
packageRequires = [ let-alist ]; packageRequires = [ let-alist ];
meta = { meta = {
@ -3700,10 +3724,10 @@
elpaBuild { elpaBuild {
pname = "page-break-lines"; pname = "page-break-lines";
ename = "page-break-lines"; ename = "page-break-lines";
version = "0.15.0.20240911.171451"; version = "0.15.0.20241107.72714";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/page-break-lines-0.15.0.20240911.171451.tar"; url = "https://elpa.nongnu.org/nongnu-devel/page-break-lines-0.15.0.20241107.72714.tar";
sha256 = "142s6q9fyr030rkdj1i349nbsfab7r742h2i1x430g8m19qai4zr"; sha256 = "0661kz0f8rippn1pi0jdzxa000vvakqv0s4y5f7f6vg41vhcna54";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -3721,10 +3745,10 @@
elpaBuild { elpaBuild {
pname = "paredit"; pname = "paredit";
ename = "paredit"; ename = "paredit";
version = "27beta0.20230718.202710"; version = "27beta0.20241103.213959";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/paredit-27beta0.20230718.202710.tar"; url = "https://elpa.nongnu.org/nongnu-devel/paredit-27beta0.20241103.213959.tar";
sha256 = "0fz65pr6p6dz3i78rzprzznzhyw34w8msnd4mzkls63bm4548gmd"; sha256 = "00xb4lzkbfsz7f7pnsjfzbhigp4r2piimj7cplq7fxjl80j39lka";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -3857,10 +3881,10 @@
elpaBuild { elpaBuild {
pname = "php-mode"; pname = "php-mode";
ename = "php-mode"; ename = "php-mode";
version = "1.26.1.0.20240912.223846"; version = "1.26.1.0.20241024.124149";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20240912.223846.tar"; url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20241024.124149.tar";
sha256 = "09jppnrpl6y1y41g7bshy674c3p39l8r060zq57kr2f022z93mg8"; sha256 = "0h5lzvsssk0nf3g408a7jg25crglsjkhcfp1ckjnzpgiwf59i6w8";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -3920,10 +3944,10 @@
elpaBuild { elpaBuild {
pname = "projectile"; pname = "projectile";
ename = "projectile"; ename = "projectile";
version = "2.9.0snapshot0.20241009.115247"; version = "2.9.0snapshot0.20241113.45011";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.0snapshot0.20241009.115247.tar"; url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.0snapshot0.20241113.45011.tar";
sha256 = "0lns0g1b52ib512dc0mqr8si6yqvnpcv148s262j5jqmm4a2sdm5"; sha256 = "1hnyq1rfldda4csmdykwsngh317cxgj0bmlqy8xjbfqpy4876gar";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -3941,10 +3965,10 @@
elpaBuild { elpaBuild {
pname = "proof-general"; pname = "proof-general";
ename = "proof-general"; ename = "proof-general";
version = "4.6snapshot0.20241004.113700"; version = "4.6snapshot0.20241126.3245";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20241004.113700.tar"; url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20241126.3245.tar";
sha256 = "1kki60ds5mqkm89lfyx2ac510200bqfnmlkfcjkn7zcrkkcl6s7r"; sha256 = "12py1s85wrvxqiha2bfbdmszy4dl9wh8pbbhfx2q7qds2hd9c3wc";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -3984,10 +4008,10 @@
elpaBuild { elpaBuild {
pname = "racket-mode"; pname = "racket-mode";
ename = "racket-mode"; ename = "racket-mode";
version = "1.0.20241001.105847"; version = "1.0.20241129.85359";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20241001.105847.tar"; url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20241129.85359.tar";
sha256 = "0yhvr3c6f2hsdj4i699h7z4gjjim359wk09z917lb8dqdd3ddjdv"; sha256 = "0j6hs2wpaknzprcm18y1ayqjcr2sl0z22fhw1yla5rv74lyqzglx";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -4068,10 +4092,10 @@
elpaBuild { elpaBuild {
pname = "reformatter"; pname = "reformatter";
ename = "reformatter"; ename = "reformatter";
version = "0.8.0.20241007.102705"; version = "0.8.0.20241106.203153";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/reformatter-0.8.0.20241007.102705.tar"; url = "https://elpa.nongnu.org/nongnu-devel/reformatter-0.8.0.20241106.203153.tar";
sha256 = "1z3zdmq78vziv45g133y1bnyzaszx0v16vdmwdfpcakj7b11qqw7"; sha256 = "1gni5f8x8d6m063k9bgaqah80w2hnb12d7qwdw1ai0xg7jb92vp7";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -4152,10 +4176,10 @@
elpaBuild { elpaBuild {
pname = "rust-mode"; pname = "rust-mode";
ename = "rust-mode"; ename = "rust-mode";
version = "1.0.6.0.20240919.160702"; version = "1.0.6.0.20241112.43839";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/rust-mode-1.0.6.0.20240919.160702.tar"; url = "https://elpa.nongnu.org/nongnu-devel/rust-mode-1.0.6.0.20241112.43839.tar";
sha256 = "10ack1z2zpfsn2li5nl6l7rpsm43hivgikjdqz5zgiskmqdfy1m5"; sha256 = "1jmby08vp18qr2cx3k6skw9mar7vb7wr5ph9q2g95wx8836g6mbp";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -4327,10 +4351,10 @@
elpaBuild { elpaBuild {
pname = "slime"; pname = "slime";
ename = "slime"; ename = "slime";
version = "2.30snapshot0.20241013.100856"; version = "2.31.0.20241201.210325";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/slime-2.30snapshot0.20241013.100856.tar"; url = "https://elpa.nongnu.org/nongnu-devel/slime-2.31.0.20241201.210325.tar";
sha256 = "19i9vgb1h20lmfskr13b7jkj7xg16dkm0ymhndi41xbimdnvav42"; sha256 = "05skikmrfcwbahph8z50kf1zh5vps7459zw7l1bipgyvhfvpq9fn";
}; };
packageRequires = [ macrostep ]; packageRequires = [ macrostep ];
meta = { meta = {
@ -4411,10 +4435,10 @@
elpaBuild { elpaBuild {
pname = "spacemacs-theme"; pname = "spacemacs-theme";
ename = "spacemacs-theme"; ename = "spacemacs-theme";
version = "0.2.0.20240825.170904"; version = "0.2.0.20241101.103011";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20240825.170904.tar"; url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20241101.103011.tar";
sha256 = "196nby3c283qls06m6vgjr0g964jpyy760y1mmllkczbm4ia34aw"; sha256 = "1sxj7xghkkayvpa1qb4d3ws81931r8s737wk3akwhayh50czh3fi";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -4516,10 +4540,10 @@
elpaBuild { elpaBuild {
pname = "subed"; pname = "subed";
ename = "subed"; ename = "subed";
version = "1.2.16.0.20241006.204608"; version = "1.2.21.0.20241117.83905";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/subed-1.2.16.0.20241006.204608.tar"; url = "https://elpa.nongnu.org/nongnu-devel/subed-1.2.21.0.20241117.83905.tar";
sha256 = "0xqqdjpkbf27yaixh60k79xnqpj8kppy9lc1z2ij73sp3lync0gb"; sha256 = "0v95g129yp9s3kknbw1fp4iqn0f0g65bhvw4433v3dbinw9l3k74";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -4538,10 +4562,10 @@
elpaBuild { elpaBuild {
pname = "sweeprolog"; pname = "sweeprolog";
ename = "sweeprolog"; ename = "sweeprolog";
version = "0.27.6.0.20240905.90947"; version = "0.27.6.0.20241107.191437";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/sweeprolog-0.27.6.0.20240905.90947.tar"; url = "https://elpa.nongnu.org/nongnu-devel/sweeprolog-0.27.6.0.20241107.191437.tar";
sha256 = "0wsl9dnz1vrr5qajcps5095gaxpqwspb16qac72sdafxidjfgabh"; sha256 = "0y543svzd7sqqb2izlflvmv0mdyfwwzjgli107ra89w5jl6jxawh";
}; };
packageRequires = [ compat ]; packageRequires = [ compat ];
meta = { meta = {
@ -4645,10 +4669,10 @@
elpaBuild { elpaBuild {
pname = "tangotango-theme"; pname = "tangotango-theme";
ename = "tangotango-theme"; ename = "tangotango-theme";
version = "0.0.7.0.20240522.132740"; version = "0.0.7.0.20241117.114955";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/tangotango-theme-0.0.7.0.20240522.132740.tar"; url = "https://elpa.nongnu.org/nongnu-devel/tangotango-theme-0.0.7.0.20241117.114955.tar";
sha256 = "1psr1amscknyw41dmsw6mvy73v271l8mzibwhl6kfp41a97cnlki"; sha256 = "1p9j3pqgp0nzsypqdx9bc1qhkgyc3s3p9rbm3la356yfc3d3wxa3";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -4770,6 +4794,28 @@
}; };
} }
) { }; ) { };
tp = callPackage (
{
elpaBuild,
fetchurl,
lib,
transient,
}:
elpaBuild {
pname = "tp";
ename = "tp";
version = "0.6.0.20241031.72940";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/tp-0.6.0.20241031.72940.tar";
sha256 = "1m8qhar75cglg8qjh3sbgwkzkhfp3640nm73nddxrshnajn978bf";
};
packageRequires = [ transient ];
meta = {
homepage = "https://elpa.nongnu.org/nongnu-devel/tp.html";
license = lib.licenses.free;
};
}
) { };
treesit-fold = callPackage ( treesit-fold = callPackage (
{ {
elpaBuild, elpaBuild,
@ -4800,10 +4846,10 @@
elpaBuild { elpaBuild {
pname = "treeview"; pname = "treeview";
ename = "treeview"; ename = "treeview";
version = "1.2.0.0.20230728.234322"; version = "1.3.1.0.20241101.11503";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/treeview-1.2.0.0.20230728.234322.tar"; url = "https://elpa.nongnu.org/nongnu-devel/treeview-1.3.1.0.20241101.11503.tar";
sha256 = "0cf64zj3iv1qzzddr5hg9rsjilczfn2c84dcgpfny7l3wzqrmwl1"; sha256 = "0hf893bhnqg4ixfvs16h3rdiizkd14gsiq0cfg63cz077vp9bskh";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -4843,10 +4889,10 @@
elpaBuild { elpaBuild {
pname = "typescript-mode"; pname = "typescript-mode";
ename = "typescript-mode"; ename = "typescript-mode";
version = "0.4.0.20240603.115709"; version = "0.4.0.20241119.194738";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/typescript-mode-0.4.0.20240603.115709.tar"; url = "https://elpa.nongnu.org/nongnu-devel/typescript-mode-0.4.0.20241119.194738.tar";
sha256 = "0v00kk4035i7b4b7clcwqxiavz89l2zxfpgk7f773ymamxpr3g82"; sha256 = "0yndbfnalj22bp2bzmrsa24a0v4cbk85b5yiqcg2diknrvsxkg2c";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -4864,10 +4910,10 @@
elpaBuild { elpaBuild {
pname = "ujelly-theme"; pname = "ujelly-theme";
ename = "ujelly-theme"; ename = "ujelly-theme";
version = "1.2.9.0.20180214.162459"; version = "1.3.6.0.20241111.2243";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/ujelly-theme-1.2.9.0.20180214.162459.tar"; url = "https://elpa.nongnu.org/nongnu-devel/ujelly-theme-1.3.6.0.20241111.2243.tar";
sha256 = "1frl87liqd9wdd6i1wwi94qzbwdx24p5shr90flrnpj6hs2yx1n3"; sha256 = "16q5n2854x9km0kd4vfr0wskbkw66pd1rf1qy34v1yacq2phb77b";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -4969,10 +5015,10 @@
elpaBuild { elpaBuild {
pname = "visual-fill-column"; pname = "visual-fill-column";
ename = "visual-fill-column"; ename = "visual-fill-column";
version = "2.6.3.0.20240411.65626"; version = "2.6.3.0.20241109.231059";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/visual-fill-column-2.6.3.0.20240411.65626.tar"; url = "https://elpa.nongnu.org/nongnu-devel/visual-fill-column-2.6.3.0.20241109.231059.tar";
sha256 = "0hyhxpqj39say3w9rpw3mhx7r9aici1wfsrr9631bnc0249qylj2"; sha256 = "1k6ih7fw0xmbm6m249cdinyx8g5k3gpdglla8242w64bqrxxcpr8";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -4992,10 +5038,10 @@
elpaBuild { elpaBuild {
pname = "vm"; pname = "vm";
ename = "vm"; ename = "vm";
version = "8.3.0snapshot0.20240917.131054"; version = "8.3.0snapshot0.20241026.45603";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20240917.131054.tar"; url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20241026.45603.tar";
sha256 = "0csg8ng38jqw5jlj5db24ngh5ay9qi8p8bvfgg3acxa26qjma03l"; sha256 = "1ipasfr8g64n2i5yn992yw8aikkjzqw1lshlai90sxrdd1s3vlgm";
}; };
packageRequires = [ packageRequires = [
cl-lib cl-lib
@ -5039,10 +5085,10 @@
elpaBuild { elpaBuild {
pname = "webpaste"; pname = "webpaste";
ename = "webpaste"; ename = "webpaste";
version = "3.2.2.0.20241002.53654"; version = "3.2.2.0.20241125.141806";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/webpaste-3.2.2.0.20241002.53654.tar"; url = "https://elpa.nongnu.org/nongnu-devel/webpaste-3.2.2.0.20241125.141806.tar";
sha256 = "0y63yrid0cxszfsm99pj6nig2siq85flma5l12fiydkpa6xh3ybj"; sha256 = "0356h3x2l0iaqk04zyp870r7bd1kzsldlqgdfn61x32krwml3iif";
}; };
packageRequires = [ packageRequires = [
cl-lib cl-lib
@ -5127,10 +5173,10 @@
elpaBuild { elpaBuild {
pname = "with-editor"; pname = "with-editor";
ename = "with-editor"; ename = "with-editor";
version = "3.4.2.0.20240831.223035"; version = "3.4.3.0.20241201.141907";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.2.0.20240831.223035.tar"; url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.3.0.20241201.141907.tar";
sha256 = "120v2n8py0qjcmlnf8l7p83w3bb5vg614ci65gliqhgmikhbwafh"; sha256 = "1srqg86809lb1b0dj421gb6n522cx19snhvhvxb4nxkk98afiywp";
}; };
packageRequires = [ compat ]; packageRequires = [ compat ];
meta = { meta = {
@ -5216,10 +5262,10 @@
elpaBuild { elpaBuild {
pname = "ws-butler"; pname = "ws-butler";
ename = "ws-butler"; ename = "ws-butler";
version = "0.6.0.20201117.102839"; version = "0.7.0.20241107.1911";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/ws-butler-0.6.0.20201117.102839.tar"; url = "https://elpa.nongnu.org/nongnu-devel/ws-butler-0.7.0.20241107.1911.tar";
sha256 = "0k1dwxw22ar3837i05a17pr52nzxjdcs1fldwlq0b5xynjfj2i3k"; sha256 = "1571dns6zdvdqvz5mnca207jpbijm9aiaf6x4iy69w91hszsdda0";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -5237,10 +5283,10 @@
elpaBuild { elpaBuild {
pname = "xah-fly-keys"; pname = "xah-fly-keys";
ename = "xah-fly-keys"; ename = "xah-fly-keys";
version = "26.6.20241009212806.0.20241009.212859"; version = "26.8.20241118173945.0.20241118.174137";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-26.6.20241009212806.0.20241009.212859.tar"; url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-26.8.20241118173945.0.20241118.174137.tar";
sha256 = "07vpnsrifc6nkf7zrhahzgxn196wm3w71zvsvb249sjf3za9gz07"; sha256 = "196hv8hjzp87b8y9k65w2zag46bx2jhmah1w9mdjxwkfbq6bjcmq";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -5323,10 +5369,10 @@
elpaBuild { elpaBuild {
pname = "yasnippet-snippets"; pname = "yasnippet-snippets";
ename = "yasnippet-snippets"; ename = "yasnippet-snippets";
version = "1.0.0.20240911.80118"; version = "1.0.0.20241014.94920";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/yasnippet-snippets-1.0.0.20240911.80118.tar"; url = "https://elpa.nongnu.org/nongnu-devel/yasnippet-snippets-1.0.0.20241014.94920.tar";
sha256 = "1wn5ckrlpacrlil6ap9j1x1lfr1yydnf0hcy268ji52hwvkdf55p"; sha256 = "065wcvb295dhyi6jvb80vagzb8idqycchqgy32pj0fr6vcxx7y88";
}; };
packageRequires = [ yasnippet ]; packageRequires = [ yasnippet ];
meta = { meta = {
@ -5366,10 +5412,10 @@
elpaBuild { elpaBuild {
pname = "zig-mode"; pname = "zig-mode";
ename = "zig-mode"; ename = "zig-mode";
version = "0.0.8.0.20240507.233944"; version = "0.0.8.0.20241104.162434";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu-devel/zig-mode-0.0.8.0.20240507.233944.tar"; url = "https://elpa.nongnu.org/nongnu-devel/zig-mode-0.0.8.0.20241104.162434.tar";
sha256 = "1skx0if2ac40csgsrfvkd73ydsvr24ijkmqrpya65n67388gibfv"; sha256 = "01g51mvsg578hcnr8kbda8pbgy7yrk57p9djy3bn1rp4vwjh2f46";
}; };
packageRequires = [ reformatter ]; packageRequires = [ reformatter ];
meta = { meta = {

172
pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
View file

@ -93,10 +93,10 @@
elpaBuild { elpaBuild {
pname = "annotate"; pname = "annotate";
ename = "annotate"; ename = "annotate";
version = "2.2.2"; version = "2.2.3";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/annotate-2.2.2.tar"; url = "https://elpa.nongnu.org/nongnu/annotate-2.2.3.tar";
sha256 = "0hrb7kjzhgy46hxaa77rv5ilsdsv6zxpawnkx4viw5jq0v5s4fl6"; sha256 = "1x0v51rbnyzwvjwp4xwsd2a4xisid65zgww6yk0bb81421i54ps3";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -544,10 +544,10 @@
elpaBuild { elpaBuild {
pname = "cider"; pname = "cider";
ename = "cider"; ename = "cider";
version = "1.16.0"; version = "1.16.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/cider-1.16.0.tar"; url = "https://elpa.nongnu.org/nongnu/cider-1.16.1.tar";
sha256 = "1chp9ixd0k6yv4m727si6pgn2kys3zi5xkiq88xbv7bjcjryqmgz"; sha256 = "12nzhxy614fbmck7k7yy5yfknvmrsafc06vysc7c6ya6q4mmb91x";
}; };
packageRequires = [ packageRequires = [
clojure-mode clojure-mode
@ -915,6 +915,28 @@
}; };
} }
) { }; ) { };
dirvish = callPackage (
{
elpaBuild,
fetchurl,
lib,
transient,
}:
elpaBuild {
pname = "dirvish";
ename = "dirvish";
version = "2.0.53";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/dirvish-2.0.53.tar";
sha256 = "02ji38zsb7lw43s919a8xfxcz2fl5cdrs3rk99cfqyvc4c1lywql";
};
packageRequires = [ transient ];
meta = {
homepage = "https://elpa.nongnu.org/nongnu/dirvish.html";
license = lib.licenses.free;
};
}
) { };
doc-show-inline = callPackage ( doc-show-inline = callPackage (
{ {
elpaBuild, elpaBuild,
@ -1009,10 +1031,10 @@
elpaBuild { elpaBuild {
pname = "dslide"; pname = "dslide";
ename = "dslide"; ename = "dslide";
version = "0.5.3"; version = "0.5.5";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/dslide-0.5.3.tar"; url = "https://elpa.nongnu.org/nongnu/dslide-0.5.5.tar";
sha256 = "11q807jp90y37s1njmr6qlnqi9pk371gj8mwg57kgjvc55qdyas5"; sha256 = "1hnmnl6ildr2cyc8hx1maa3vnz621d41yhsx8naxq3mssz4rkajp";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -1116,10 +1138,10 @@
elpaBuild { elpaBuild {
pname = "elpher"; pname = "elpher";
ename = "elpher"; ename = "elpher";
version = "3.6.3"; version = "3.6.4";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/elpher-3.6.3.tar"; url = "https://elpa.nongnu.org/nongnu/elpher-3.6.4.tar";
sha256 = "0vjsb2jfgnf9jya14zigy2jcd8agxsncm7cxg61jm940jyvs8fsq"; sha256 = "0f6hsw50a36jyp1ikawcdj9yn3isks03ax47x8vflmayydndir4g";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -1137,10 +1159,10 @@
elpaBuild { elpaBuild {
pname = "emacsql"; pname = "emacsql";
ename = "emacsql"; ename = "emacsql";
version = "4.0.3"; version = "4.1.0";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/emacsql-4.0.3.tar"; url = "https://elpa.nongnu.org/nongnu/emacsql-4.1.0.tar";
sha256 = "1179z8d5mzhmnq2b1q9pf450jflxvrk5y2i3hzdl8lvd4nrm6kgw"; sha256 = "1nf7piakf1v23bnqdyivp4l9vq6xyzjxrgxaswncmvzqxb4qvhyx";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -2085,10 +2107,10 @@
elpaBuild { elpaBuild {
pname = "gnosis"; pname = "gnosis";
ename = "gnosis"; ename = "gnosis";
version = "0.4.5"; version = "0.4.8";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/gnosis-0.4.5.tar"; url = "https://elpa.nongnu.org/nongnu/gnosis-0.4.8.tar";
sha256 = "00rca3rfij2c8120kzs8wc6xsarpcj20gzwys05c7fhf7j8l5bdy"; sha256 = "1sf6213qj6i306rqbp1a5wj7haw5vkmc1684fdfqzyqa1gw2ni5v";
}; };
packageRequires = [ packageRequires = [
compat compat
@ -2259,10 +2281,10 @@
elpaBuild { elpaBuild {
pname = "gptel"; pname = "gptel";
ename = "gptel"; ename = "gptel";
version = "0.9.5"; version = "0.9.6";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/gptel-0.9.5.tar"; url = "https://elpa.nongnu.org/nongnu/gptel-0.9.6.tar";
sha256 = "0ixji76xaqkm0ziidjmanax4q0xqyj1qcwva6r5sbsks6gpmrziv"; sha256 = "0n7d8plabgmpyl224079cqrwlgqq7wwysba0wd0ry75h6z388rcb";
}; };
packageRequires = [ packageRequires = [
compat compat
@ -2644,10 +2666,10 @@
elpaBuild { elpaBuild {
pname = "hyperdrive-org-transclusion"; pname = "hyperdrive-org-transclusion";
ename = "hyperdrive-org-transclusion"; ename = "hyperdrive-org-transclusion";
version = "0.2"; version = "0.3.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/hyperdrive-org-transclusion-0.2.tar"; url = "https://elpa.nongnu.org/nongnu/hyperdrive-org-transclusion-0.3.1.tar";
sha256 = "1zbhbsfrdcc5mfkpbzwkyn9bgapf8hs0jzy14lv9d5g99wskzbis"; sha256 = "074ylcblg6wg2yg8jv1i6cn8vig56br0bqp5xwmhkslwrkqj05cj";
}; };
packageRequires = [ packageRequires = [
hyperdrive hyperdrive
@ -2889,10 +2911,10 @@
elpaBuild { elpaBuild {
pname = "julia-mode"; pname = "julia-mode";
ename = "julia-mode"; ename = "julia-mode";
version = "1.0.0"; version = "1.0.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/julia-mode-1.0.0.tar"; url = "https://elpa.nongnu.org/nongnu/julia-mode-1.0.1.tar";
sha256 = "02xab8qhf1z4cdn847n9ar2g65843qknca88jkaa94zzkxpv2bi1"; sha256 = "0203h99yia5k37ansy2wshkiyn105jaahmkm0ncf54far8dw6mwx";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -3027,10 +3049,10 @@
elpaBuild { elpaBuild {
pname = "magit"; pname = "magit";
ename = "magit"; ename = "magit";
version = "4.1.1"; version = "4.1.2";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/magit-4.1.1.tar"; url = "https://elpa.nongnu.org/nongnu/magit-4.1.2.tar";
sha256 = "0rjxlrs5ik6mqnvs9mz2pjmz23np3ch0ybkzimd9ji70283fyif6"; sha256 = "1jyivrk78fnp7kcrac9sm2ldbxg9c96qhnlz06wv1m7hbvd3fgfx";
}; };
packageRequires = [ packageRequires = [
compat compat
@ -3058,10 +3080,10 @@
elpaBuild { elpaBuild {
pname = "magit-section"; pname = "magit-section";
ename = "magit-section"; ename = "magit-section";
version = "4.1.1"; version = "4.1.2";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/magit-section-4.1.1.tar"; url = "https://elpa.nongnu.org/nongnu/magit-section-4.1.2.tar";
sha256 = "1vbfvnmmm026zk098vxk21zh8r444cy476br4b6y20lhnniybh7s"; sha256 = "0g24aj030fh55y44f3c33708fbm02jwzggh75zvg63bka3g6j242";
}; };
packageRequires = [ packageRequires = [
compat compat
@ -3102,18 +3124,20 @@
lib, lib,
persist, persist,
request, request,
tp,
}: }:
elpaBuild { elpaBuild {
pname = "mastodon"; pname = "mastodon";
ename = "mastodon"; ename = "mastodon";
version = "1.0.27"; version = "1.1.7";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.27.tar"; url = "https://elpa.nongnu.org/nongnu/mastodon-1.1.7.tar";
sha256 = "0kbbzmqnnh0pvd215660p1c2wljnxr5139vs17k9cnh8n5qsddjr"; sha256 = "0qnkbab6y0gpqq0kvil4gnbajflpv0mz3pzcimcvz79dnmb0vc9p";
}; };
packageRequires = [ packageRequires = [
persist persist
request request
tp
]; ];
meta = { meta = {
homepage = "https://elpa.nongnu.org/nongnu/mastodon.html"; homepage = "https://elpa.nongnu.org/nongnu/mastodon.html";
@ -3181,10 +3205,10 @@
elpaBuild { elpaBuild {
pname = "meow"; pname = "meow";
ename = "meow"; ename = "meow";
version = "1.4.5"; version = "1.5.0";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/meow-1.4.5.tar"; url = "https://elpa.nongnu.org/nongnu/meow-1.5.0.tar";
sha256 = "1d63mw88vq97rq3a7qhkxid2xaag5dp21ijisw9s3fk972kcks3s"; sha256 = "1fwd6lwaci23scgv65fxrxg51w334pw92l4c51ci9s0qgh1vjb01";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -4007,10 +4031,10 @@
elpaBuild { elpaBuild {
pname = "racket-mode"; pname = "racket-mode";
ename = "racket-mode"; ename = "racket-mode";
version = "1.0.20241001.105847"; version = "1.0.20241129.85359";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20241001.105847.tar"; url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20241129.85359.tar";
sha256 = "0wwg30wbigmnb7yz9wc2yrq58jzysd2vp1g2324lbc95z61ng5yd"; sha256 = "0ish7ysdqypw849k9d3cw0bl69r5ksc3hrqdmyh8k2ipq2xbcn2w";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -4346,10 +4370,10 @@
elpaBuild { elpaBuild {
pname = "slime"; pname = "slime";
ename = "slime"; ename = "slime";
version = "2.30"; version = "2.31";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/slime-2.30.tar"; url = "https://elpa.nongnu.org/nongnu/slime-2.31.tar";
sha256 = "0gzgwrx6llj35kga21m3m4vp0g7f7dypim7pdnhy9sxrvl0k8v5f"; sha256 = "1s77j55nwz1s1c6763v0agsip5vrzd6f157q7i5z1jdmj3y0psck";
}; };
packageRequires = [ macrostep ]; packageRequires = [ macrostep ];
meta = { meta = {
@ -4535,10 +4559,10 @@
elpaBuild { elpaBuild {
pname = "subed"; pname = "subed";
ename = "subed"; ename = "subed";
version = "1.2.16"; version = "1.2.21";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/subed-1.2.16.tar"; url = "https://elpa.nongnu.org/nongnu/subed-1.2.21.tar";
sha256 = "0fsxsp8g70mr36njmv2h3qrmp1mw3r4clrlzib33iq02wmw7q3rg"; sha256 = "1d0w96amchcpblcbkl16yiwsvj8qfpax66ysjg02550lhpb493x7";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -4811,6 +4835,28 @@
}; };
} }
) { }; ) { };
tp = callPackage (
{
elpaBuild,
fetchurl,
lib,
transient,
}:
elpaBuild {
pname = "tp";
ename = "tp";
version = "0.6";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/tp-0.6.tar";
sha256 = "1a4n6bhaxiiwy11ig09w7p1jxrsl5gfk7ikma9jzv2z54f2p97kz";
};
packageRequires = [ transient ];
meta = {
homepage = "https://elpa.nongnu.org/nongnu/tp.html";
license = lib.licenses.free;
};
}
) { };
treeview = callPackage ( treeview = callPackage (
{ {
elpaBuild, elpaBuild,
@ -4820,10 +4866,10 @@
elpaBuild { elpaBuild {
pname = "treeview"; pname = "treeview";
ename = "treeview"; ename = "treeview";
version = "1.2.0"; version = "1.3.1";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/treeview-1.2.0.tar"; url = "https://elpa.nongnu.org/nongnu/treeview-1.3.1.tar";
sha256 = "1dmix7hn5yl69r987f0g2m00p866ln8412dm7fj399pmn1kdfsvy"; sha256 = "02xac8kfh5j6vz0k44wif5v9h9xzs7srwxk0jff21qw32wy4accl";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -4884,10 +4930,10 @@
elpaBuild { elpaBuild {
pname = "ujelly-theme"; pname = "ujelly-theme";
ename = "ujelly-theme"; ename = "ujelly-theme";
version = "1.2.9"; version = "1.3.6";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/ujelly-theme-1.2.9.tar"; url = "https://elpa.nongnu.org/nongnu/ujelly-theme-1.3.6.tar";
sha256 = "1yyjsdcwprynwk86phpqfifv6xkmn49yrj6fkh5s57w5sbby4fp0"; sha256 = "19z3nf8avsipyywwlr77sy1bmf6gx5kk3fyph6nn4sn5vhcmgg0p";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -5121,10 +5167,10 @@
elpaBuild { elpaBuild {
pname = "with-editor"; pname = "with-editor";
ename = "with-editor"; ename = "with-editor";
version = "3.4.2"; version = "3.4.3";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/with-editor-3.4.2.tar"; url = "https://elpa.nongnu.org/nongnu/with-editor-3.4.3.tar";
sha256 = "0z6zi271p2ch4gylkz4ynj44hyxjmvvmg7xjsxwjmsyi800kwr58"; sha256 = "1n0cnxhbqb49i6pknx47f81vlpwi9a6cjbjzr8b349fh6yv3q9w7";
}; };
packageRequires = [ compat ]; packageRequires = [ compat ];
meta = { meta = {
@ -5210,10 +5256,10 @@
elpaBuild { elpaBuild {
pname = "ws-butler"; pname = "ws-butler";
ename = "ws-butler"; ename = "ws-butler";
version = "0.6"; version = "0.7";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/ws-butler-0.6.tar"; url = "https://elpa.nongnu.org/nongnu/ws-butler-0.7.tar";
sha256 = "1jzlwj2pqan3bj0mipvh8vzvmgynrxf1dqphix7g86ppjv1ivmfy"; sha256 = "1rwkwcb4079czdsccldzq4kjrl25y53k4zy2n7026cd7hxxvc959";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {
@ -5231,10 +5277,10 @@
elpaBuild { elpaBuild {
pname = "xah-fly-keys"; pname = "xah-fly-keys";
ename = "xah-fly-keys"; ename = "xah-fly-keys";
version = "26.6.20241009212806"; version = "26.8.20241118173945";
src = fetchurl { src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-26.6.20241009212806.tar"; url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-26.8.20241118173945.tar";
sha256 = "17xyb1dvsi2hqnhhk8vzbrskhlbh6w869c1iy14cdy3yndj7y8v2"; sha256 = "1l6wwv1zmpsf64v23zzi2idjb14wnbpv5fcspiygiah62zag44vf";
}; };
packageRequires = [ ]; packageRequires = [ ];
meta = { meta = {

5707
pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
View file

File diff suppressed because it is too large Load diff

57
pkgs/applications/editors/emacs/make-emacs.nix
View file

@ -13,6 +13,7 @@
Xaw3d, Xaw3d,
acl, acl,
alsa-lib, alsa-lib,
apple-sdk,
autoreconfHook, autoreconfHook,
cairo, cairo,
dbus, dbus,
@ -53,7 +54,7 @@
recurseIntoAttrs, recurseIntoAttrs,
sigtool, sigtool,
sqlite, sqlite,
substituteAll, replaceVars,
systemd, systemd,
tree-sitter, tree-sitter,
texinfo, texinfo,
@ -171,32 +172,40 @@ mkDerivation (finalAttrs: {
patches = patches =
patches fetchpatch patches fetchpatch
++ lib.optionals withNativeCompilation [ ++ lib.optionals withNativeCompilation [
(substituteAll { (replaceVars
src = (
if lib.versionOlder finalAttrs.version "29" then if lib.versionOlder finalAttrs.version "29" then
./native-comp-driver-options-28.patch ./native-comp-driver-options-28.patch
else if lib.versionOlder finalAttrs.version "30" then else if lib.versionOlder finalAttrs.version "30" then
./native-comp-driver-options.patch ./native-comp-driver-options.patch
else else
./native-comp-driver-options-30.patch; ./native-comp-driver-options-30.patch
backendPath = ( )
lib.concatStringsSep " " ( {
builtins.map (x: ''"-B${x}"'') (
[ backendPath = (
# Paths necessary so the JIT compiler finds its libraries: lib.concatStringsSep " " (
"${lib.getLib libgccjit}/lib" builtins.map (x: ''"-B${x}"'') (
] [
++ libGccJitLibraryPaths # Paths necessary so the JIT compiler finds its libraries:
++ [ "${lib.getLib libgccjit}/lib"
# Executable paths necessary for compilation (ld, as): ]
"${lib.getBin stdenv.cc.cc}/bin" ++ libGccJitLibraryPaths
"${lib.getBin stdenv.cc.bintools}/bin" ++ [
"${lib.getBin stdenv.cc.bintools.bintools}/bin" # Executable paths necessary for compilation (ld, as):
] "${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"
]
)
) )
) );
); }
}) )
]; ];
postPatch = lib.concatStringsSep "\n" [ postPatch = lib.concatStringsSep "\n" [
@ -221,15 +230,15 @@ mkDerivation (finalAttrs: {
# Reduce closure size by cleaning the environment of the emacs dumper # Reduce closure size by cleaning the environment of the emacs dumper
'' ''
substituteInPlace src/Makefile.in \ 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 \ 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 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 done
'' ''

10
pkgs/applications/editors/emacs/site-start.el
View file

@ -39,6 +39,16 @@ least specific (the system profile)"
(setenv "EMACSNATIVELOADPATH" (when new-env-list (setenv "EMACSNATIVELOADPATH" (when new-env-list
(mapconcat 'identity new-env-list ":")))))) (mapconcat 'identity new-env-list ":"))))))
(let ((wrapper-invocation-directory (getenv "emacsWithPackages_invocationDirectory")))
(when wrapper-invocation-directory
(setq invocation-directory (file-name-as-directory wrapper-invocation-directory))
(setenv "emacsWithPackages_invocationDirectory" nil)))
(let ((wrapper-invocation-name (getenv "emacsWithPackages_invocationName")))
(when wrapper-invocation-name
(setq invocation-name wrapper-invocation-name)
(setenv "emacsWithPackages_invocationName" nil)))
;;; Set up native-comp load path. ;;; Set up native-comp load path.
(when (featurep 'native-compile) (when (featurep 'native-compile)
;; Append native-comp subdirectories from `NIX_PROFILES'. ;; Append native-comp subdirectories from `NIX_PROFILES'.

2
pkgs/applications/editors/neovim/utils.nix
View file

@ -108,7 +108,7 @@ let
# the function you would have passed to lua.withPackages # the function you would have passed to lua.withPackages
extraLuaPackages ? (_: [ ]), extraLuaPackages ? (_: [ ]),
withNodeJs ? false, withNodeJs ? false,
withRuby ? true, withRuby ? false,
vimAlias ? false, vimAlias ? false,
viAlias ? false, viAlias ? false,
configure ? { }, configure ? { },

4
pkgs/applications/editors/vim/common.nix
View file

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub }: { lib, fetchFromGitHub }:
rec { rec {
version = "9.1.0787"; version = "9.1.0905";
outputs = [ outputs = [
"out" "out"
@ -11,7 +11,7 @@ rec {
owner = "vim"; owner = "vim";
repo = "vim"; repo = "vim";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-kV2SaIOUv+ZcDsqBibZZ38gCevVLhejcYtY0TCQVtig="; hash = "sha256-sFsTONGeSocn1M8NZo5LjIhagmq/nR1zrGRN7p86Q4o=";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

140
pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh
View file

@ -1,24 +1,136 @@
#shellcheck shell=bash #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" 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" echo "Executing neovimRequireCheckHook"
if [ -n "$nvimRequireCheck" ]; then if [ "${nvimRequireCheck[*]}" = "" ]; then
echo "Check whether the following module can be imported: $nvimRequireCheck" echo "nvimRequireCheck is empty; entering discovery mode"
# Auto-discovery mode
# editorconfig-checker-disable if ! discover_modules; then
export HOME="$TMPDIR" echo "No modules found during discovery; exiting hook"
return
local deps="${dependencies[*]}" fi
@nvimBinary@ -es --headless -n -u NONE -i NONE --clean -V1 \ else
--cmd "set rtp+=$out,${deps// /,}" \ echo "nvimRequireCheck is pre-populated; entering manual check mode"
--cmd "lua require('$nvimRequireCheck')"
fi fi
run_require_checks
print_summary
} }
echo "Using neovimRequireCheckHook" echo "Using neovimRequireCheckHook"
appendToVar preDistPhases neovimRequireCheckHook appendToVar preDistPhases neovimRequireCheckHook

11
pkgs/applications/editors/vim/plugins/overrides.nix
View file

@ -392,6 +392,13 @@ in
cmp-dictionary = super.cmp-dictionary.overrideAttrs (oa: { cmp-dictionary = super.cmp-dictionary.overrideAttrs (oa: {
nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ]; 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: { cmp-digraphs = super.cmp-digraphs.overrideAttrs (oa: {
@ -2596,6 +2603,10 @@ in
"snacks.terminal" "snacks.terminal"
"snacks.win" "snacks.win"
"snacks.words" "snacks.words"
"snacks.debug"
"snacks.scratch"
# Optional trouble integration
"trouble.sources.profiler"
]; ];
}; };

9
pkgs/applications/editors/vim/plugins/vim-utils.nix
View file

@ -499,8 +499,15 @@ rec {
nativeBuildInputs = nativeBuildInputs =
oldAttrs.nativeBuildInputs or [ ] oldAttrs.nativeBuildInputs or [ ]
++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
vimCommandCheckHook
vimGenDocHook vimGenDocHook
];
doCheck = oldAttrs.doCheck or true;
nativeCheckInputs =
oldAttrs.nativeCheckInputs or [ ]
++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
vimCommandCheckHook
# many neovim plugins keep using buildVimPlugin # many neovim plugins keep using buildVimPlugin
neovimRequireCheckHook neovimRequireCheckHook
]; ];

4
pkgs/applications/editors/vscode/generic.nix
View file

@ -11,7 +11,7 @@
at-spi2-atk, at-spi2-atk,
autoPatchelfHook, autoPatchelfHook,
alsa-lib, alsa-lib,
mesa, libgbm,
nss, nss,
nspr, nspr,
xorg, xorg,
@ -200,7 +200,7 @@ stdenv.mkDerivation (
alsa-lib alsa-lib
at-spi2-atk at-spi2-atk
libkrb5 libkrb5
mesa libgbm
nss nss
nspr nspr
systemd systemd

2
pkgs/applications/emulators/wine/base.nix
View file

@ -105,7 +105,7 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; }
]) ])
++ lib.optionals waylandSupport (with pkgs; [ ++ lib.optionals waylandSupport (with pkgs; [
wayland wayland-scanner libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev wayland wayland-scanner libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev
mesa # for libgbm libgbm
]))); ])));
inherit patches; inherit patches;

2
pkgs/applications/gis/grass/default.nix
View file

@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
libpng libpng
libsvm libsvm
libtiff libtiff
(libxml2.override { enableHttp = true; }) libxml2
netcdf netcdf
pdal pdal
postgresql postgresql

7
pkgs/applications/graphics/inkscape/default.nix
View file

@ -6,6 +6,7 @@
, callPackage , callPackage
, cmake , cmake
, desktopToDarwinBundle , desktopToDarwinBundle
, fetchpatch
, fetchurl , fetchurl
, fd , fd
, gettext , gettext
@ -85,6 +86,12 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true; strictDeps = true;
patches = [ patches = [
(fetchpatch {
# fix typo in gobjectptr member function. remove on update
name = "gobjectptr-fix-member-name.patch";
url = "https://gitlab.com/inkscape/inkscape/-/commit/eb6dadcf1a5c660167ba43f3606c8e7cc6529787.patch";
hash = "sha256-FvbJV/YrBwhHg0kFdbhyd/Y9g7YV2nPIrRqZt7yJ50Q=";
})
(substituteAll { (substituteAll {
src = ./fix-python-paths.patch; src = ./fix-python-paths.patch;
# Python is used at run-time to execute scripts, # Python is used at run-time to execute scripts,

2
pkgs/applications/graphics/processing/default.nix
View file

@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
echo "tarring jdk" echo "tarring jdk"
tar --checkpoint=10000 -czf build/linux/jdk-17.0.8-${arch}.tgz ${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 mkdir -p core/library
ln -s ${jogl}/share/java/* core/library/ ln -s ${jogl}/share/java/* core/library/
ln -s ${vaqua} app/lib/VAqua9.jar ln -s ${vaqua} app/lib/VAqua9.jar

4
pkgs/applications/graphics/seamly2d/default.nix
View file

@ -8,7 +8,7 @@
poppler_utils, poppler_utils,
qtxmlpatterns, qtxmlpatterns,
qtsvg, qtsvg,
mesa, libgbm,
xvfb-run, xvfb-run,
fontconfig, fontconfig,
freetype, freetype,
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
poppler_utils poppler_utils
qtxmlpatterns qtxmlpatterns
qtsvg qtsvg
mesa libgbm
freetype freetype
xorg.libXi xorg.libXi
xorg.libXrender xorg.libXrender

5
pkgs/applications/kde/kdegraphics-thumbnailers/default.nix
View file

@ -2,7 +2,7 @@
mkDerivation, mkDerivation,
lib, lib,
ghostscript, ghostscript,
substituteAll, replaceVars,
extra-cmake-modules, extra-cmake-modules,
karchive, karchive,
kio, kio,
@ -29,9 +29,8 @@ mkDerivation {
patches = [ patches = [
# Hardcode patches to Ghostscript so PDF thumbnails work OOTB. # Hardcode patches to Ghostscript so PDF thumbnails work OOTB.
# Intentionally not doing the same for dvips because TeX is big. # Intentionally not doing the same for dvips because TeX is big.
(substituteAll { (replaceVars ./gs-paths.patch {
gs = "${ghostscript}/bin/gs"; gs = "${ghostscript}/bin/gs";
src = ./gs-paths.patch;
}) })
]; ];
} }

6
pkgs/applications/kde/marble.nix
View file

@ -47,7 +47,7 @@ mkDerivation {
knewstuff knewstuff
gpsd gpsd
]; ];
preConfigure = '' cmakeFlags = [
cmakeFlags+=" -DINCLUDE_INSTALL_DIR=''${!outputDev}/include" "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
''; ];
} }

4
pkgs/applications/misc/1password-gui/linux.nix
View file

@ -30,7 +30,7 @@
libxshmfence, libxshmfence,
libGL, libGL,
libappindicator-gtk3, libappindicator-gtk3,
mesa, libgbm,
nspr, nspr,
nss, nss,
pango, pango,
@ -94,7 +94,7 @@ stdenv.mkDerivation {
libxshmfence libxshmfence
libGL libGL
libappindicator-gtk3 libappindicator-gtk3
mesa libgbm
nspr nspr
nss nss
pango pango

2
pkgs/applications/misc/lutris/fhsenv.nix
View file

@ -126,7 +126,7 @@ buildFHSEnv {
# Libretro # Libretro
fluidsynth fluidsynth
hidapi hidapi
mesa libgbm
libdrm libdrm
# MAME # MAME

6
pkgs/applications/misc/maliit-framework/default.nix
View file

@ -67,9 +67,9 @@ mkDerivation rec {
wayland-scanner wayland-scanner
]; ];
preConfigure = '' cmakeFlags = [
cmakeFlags+="-DQT5_PLUGINS_INSTALL_DIR=$out/$qtPluginPrefix" "-DQT5_PLUGINS_INSTALL_DIR=${placeholder "out"}/$qtPluginPrefix"
''; ];
meta = with lib; { meta = with lib; {
description = "Core libraries of Maliit and server"; description = "Core libraries of Maliit and server";

4
pkgs/applications/misc/survex/default.nix
View file

@ -10,7 +10,7 @@
libGLU, libGLU,
libICE, libICE,
libX11, libX11,
mesa, libgbm,
perl, perl,
pkg-config, pkg-config,
proj, proj,
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
# TODO: libGLU doesn't build for macOS because of Mesa issues # TODO: libGLU doesn't build for macOS because of Mesa issues
# (#233265); is it required for anything? # (#233265); is it required for anything?
libGLU libGLU
mesa libgbm
libICE libICE
libX11 libX11
]; ];

8
pkgs/applications/networking/browsers/chromium/common.nix
View file

@ -64,7 +64,8 @@
libxshmfence, libxshmfence,
libGLU, libGLU,
libGL, libGL,
mesa, dri-pkgconfig-stub,
libgbm,
pciutils, pciutils,
protobuf, protobuf,
speechd-minimal, speechd-minimal,
@ -350,7 +351,7 @@ let
libxshmfence libxshmfence
libGLU libGLU
libGL libGL
mesa # required for libgbm libgbm
pciutils pciutils
protobuf protobuf
speechd-minimal speechd-minimal
@ -407,7 +408,8 @@ let
libxshmfence libxshmfence
libGLU libGLU
libGL libGL
mesa # required for libgbm dri-pkgconfig-stub
libgbm
pciutils pciutils
protobuf protobuf
speechd-minimal speechd-minimal

23
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -268,6 +268,29 @@ buildStdenv.mkDerivation {
hash = "sha256-2IpdSyye3VT4VB95WurnyRFtdN1lfVtYpgEiUVhfNjw="; 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=";
})
# Python 3.12.8 compat
# https://bugzilla.mozilla.org/show_bug.cgi?id=1935621
# https://phabricator.services.mozilla.com/D231480
./mozbz-1935621-attachment-9442305.patch
]
++ extraPatches; ++ extraPatches;
postPatch = '' postPatch = ''

119
pkgs/applications/networking/browsers/firefox/mozbz-1935621-attachment-9442305.patch Normal file
View file

@ -0,0 +1,119 @@
diff --git a/python/mach/mach/site.py b/python/mach/mach/site.py
--- a/python/mach/mach/site.py
+++ b/python/mach/mach/site.py
@@ -15,10 +15,11 @@
import site
import subprocess
import sys
import sysconfig
import tempfile
+import warnings
from contextlib import contextmanager
from pathlib import Path
from typing import Callable, Optional
from mach.requirements import (
@@ -817,37 +818,79 @@
class PythonVirtualenv:
"""Calculates paths of interest for general python virtual environments"""
def __init__(self, prefix):
- if _is_windows:
- self.bin_path = os.path.join(prefix, "Scripts")
- self.python_path = os.path.join(self.bin_path, "python.exe")
- else:
- self.bin_path = os.path.join(prefix, "bin")
- self.python_path = os.path.join(self.bin_path, "python")
self.prefix = os.path.realpath(prefix)
+ self.paths = self._get_sysconfig_paths(self.prefix)
- @functools.lru_cache(maxsize=None)
- def resolve_sysconfig_packages_path(self, sysconfig_path):
- # macOS uses a different default sysconfig scheme based on whether it's using the
- # system Python or running in a virtualenv.
- # Manually define the scheme (following the implementation in
- # "sysconfig._get_default_scheme()") so that we're always following the
- # code path for a virtualenv directory structure.
- if os.name == "posix":
- scheme = "posix_prefix"
- else:
- scheme = os.name
+ # Name of the Python executable to use in virtual environments.
+ # An executable with the same name as sys.executable might not exist in
+ # virtual environments. An executable with 'python' as the steam —
+ # without version numbers or ABI flags — will always be present in
+ # virtual environments, so we use that.
+ python_exe_name = "python" + sysconfig.get_config_var("EXE")
+
+ self.bin_path = self.paths["scripts"]
+ self.python_path = os.path.join(self.bin_path, python_exe_name)
- sysconfig_paths = sysconfig.get_paths(scheme)
- data_path = Path(sysconfig_paths["data"])
- path = Path(sysconfig_paths[sysconfig_path])
- relative_path = path.relative_to(data_path)
+ @staticmethod
+ def _get_sysconfig_paths(prefix):
+ """Calculate the sysconfig paths of a virtual environment in the given prefix.
- # Path to virtualenv's "site-packages" directory for provided sysconfig path
- return os.path.normpath(os.path.normcase(Path(self.prefix) / relative_path))
+ The virtual environment MUST be using the same Python distribution as us.
+ """
+ # Determine the sysconfig scheme used in virtual environments
+ if "venv" in sysconfig.get_scheme_names():
+ # A 'venv' scheme was added in Python 3.11 to allow users to
+ # calculate the paths for a virtual environment, since the default
+ # scheme may not always be the same as used on virtual environments.
+ # Some common examples are the system Python distributed by macOS,
+ # Debian, and Fedora.
+ # For more information, see https://github.com/python/cpython/issues/89576
+ venv_scheme = "venv"
+ elif os.name == "nt":
+ # We know that before the 'venv' scheme was added, on Windows,
+ # the 'nt' scheme was used in virtual environments.
+ venv_scheme = "nt"
+ elif os.name == "posix":
+ # We know that before the 'venv' scheme was added, on POSIX,
+ # the 'posix_prefix' scheme was used in virtual environments.
+ venv_scheme = "posix_prefix"
+ else:
+ # This should never happen with upstream Python, as the 'venv'
+ # scheme should always be available on >=3.11, and no other
+ # platforms are supported by the upstream on older Python versions.
+ #
+ # Since the 'venv' scheme isn't available, and we have no knowledge
+ # of this platform/distribution, fallback to the default scheme.
+ #
+ # Hitting this will likely be the result of running a custom Python
+ # distribution targetting a platform that is not supported by the
+ # upstream.
+ # In this case, unless the Python vendor patched the Python
+ # distribution in such a way as the default scheme may not always be
+ # the same scheme, using the default scheme should be correct.
+ # If the vendor did patch Python as such, to work around this issue,
+ # I would recommend them to define a 'venv' scheme that matches
+ # the layout used on virtual environments in their Python distribution.
+ # (rec. signed Filipe Laíns — upstream sysconfig maintainer)
+ venv_scheme = sysconfig.get_default_scheme()
+ warnings.warn(
+ f"Unknown platform '{os.name}', using the default install scheme '{venv_scheme}'. "
+ "If this is incorrect, please ask your Python vendor to add a 'venv' sysconfig scheme "
+ "(see https://github.com/python/cpython/issues/89576, or check the code comment).",
+ stacklevel=2,
+ )
+ # Build the sysconfig config_vars dictionary for the virtual environment.
+ venv_vars = sysconfig.get_config_vars().copy()
+ venv_vars["base"] = venv_vars["platbase"] = prefix
+ # Get sysconfig paths for the virtual environment.
+ return sysconfig.get_paths(venv_scheme, vars=venv_vars)
+
+ def resolve_sysconfig_packages_path(self, sysconfig_path):
+ return self.paths[sysconfig_path]
def site_packages_dirs(self):
dirs = []
if sys.platform.startswith("win"):
dirs.append(os.path.normpath(os.path.normcase(self.prefix)))

10
pkgs/applications/networking/browsers/firefox/wrapper.nix
View file

@ -12,14 +12,13 @@
, udev , udev
, libkrb5 , libkrb5
, libva , libva
, mesa # firefox wants gbm for drm+dmabuf , libgbm
, cups , cups
, pciutils , pciutils
, vulkan-loader , vulkan-loader
, sndio , sndio
, libjack2 , libjack2
, speechd-minimal , speechd-minimal
, removeReferencesTo
}: }:
## configurability of the wrapper itself ## configurability of the wrapper itself
@ -89,7 +88,7 @@ let
); );
libs = lib.optionals stdenv.hostPlatform.isLinux ( libs = lib.optionals stdenv.hostPlatform.isLinux (
[ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils vulkan-loader ] [ udev libva libgbm libnotify xorg.libXScrnSaver cups pciutils vulkan-loader ]
++ lib.optional (cfg.speechSynthesisSupport or true) speechd-minimal ++ lib.optional (cfg.speechSynthesisSupport or true) speechd-minimal
) )
++ lib.optional pipewireSupport pipewire ++ lib.optional pipewireSupport pipewire
@ -243,7 +242,7 @@ let
}; };
})); }));
nativeBuildInputs = [ makeWrapper lndir jq removeReferencesTo ]; nativeBuildInputs = [ makeWrapper lndir jq ];
buildInputs = [ browser.gtk3 ]; buildInputs = [ browser.gtk3 ];
@ -426,9 +425,6 @@ let
passthru = { unwrapped = browser; }; passthru = { unwrapped = browser; };
disallowedRequisites = [ stdenv.cc ]; disallowedRequisites = [ stdenv.cc ];
postInstall = ''
find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' +
'';
meta = browser.meta // { meta = browser.meta // {
inherit (browser.meta) description; inherit (browser.meta) description;
mainProgram = launcherName; mainProgram = launcherName;

4
pkgs/applications/networking/browsers/vivaldi/default.nix
View file

@ -6,7 +6,7 @@
, libxml2 , libxml2
, glib, gtk3, pango, gdk-pixbuf, cairo, atk, at-spi2-atk, at-spi2-core , glib, gtk3, pango, gdk-pixbuf, cairo, atk, at-spi2-atk, at-spi2-core
, qt5 , qt5
, libdrm, mesa , libdrm, libgbm
, vulkan-loader , vulkan-loader
, nss, nspr , nss, nspr
, patchelf, makeWrapper , patchelf, makeWrapper
@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
qt5.qtbase qt5.qtbase
freetype fontconfig libXrender libuuid expat glib nss nspr libGL freetype fontconfig libXrender libuuid expat glib nss nspr libGL
libxml2 pango cairo libxml2 pango cairo
libdrm mesa vulkan-loader libdrm libgbm vulkan-loader
wayland pipewire wayland pipewire
] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs
++ lib.optional pulseSupport libpulseaudio ++ lib.optional pulseSupport libpulseaudio

2
pkgs/applications/networking/dropbox/default.nix
View file

@ -46,7 +46,7 @@ buildFHSEnv {
libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender libXmu libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender libXmu
libXxf86vm libGL libxcb xkeyboardconfig libXxf86vm libGL libxcb xkeyboardconfig
curl dbus firefox-bin fontconfig freetype gcc glib gnutar libxml2 libxslt curl dbus firefox-bin fontconfig freetype gcc glib gnutar libxml2 libxslt
procps zlib mesa libxshmfence libpthreadstubs libappindicator procps zlib libgbm libxshmfence libpthreadstubs libappindicator
]; ];
extraInstallCommands = '' extraInstallCommands = ''

6
pkgs/applications/networking/instant-messengers/discord/linux.nix
View file

@ -43,7 +43,7 @@
libXtst, libXtst,
libxcb, libxcb,
libxshmfence, libxshmfence,
mesa, libgbm,
nspr, nspr,
nss, nss,
pango, pango,
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
libXtst libXtst
libxcb libxcb
libxshmfence libxshmfence
mesa libgbm
nss nss
wrapGAppsHook3 wrapGAppsHook3
makeShellWrapper makeShellWrapper
@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
systemd systemd
libpulseaudio libpulseaudio
libdrm libdrm
mesa libgbm
stdenv.cc.cc stdenv.cc.cc
alsa-lib alsa-lib
atk atk

4
pkgs/applications/networking/instant-messengers/franz/generic.nix
View file

@ -23,7 +23,7 @@
udev, udev,
libnotify, libnotify,
xdg-utils, xdg-utils,
mesa, libgbm,
libglvnd, libglvnd,
libappindicator-gtk3, libappindicator-gtk3,
}: }:
@ -83,7 +83,7 @@ stdenv.mkDerivation (
libXScrnSaver libXScrnSaver
]) ])
++ [ ++ [
mesa # libgbm libgbm
gtk3 gtk3
atk atk
glib glib

4
pkgs/applications/networking/instant-messengers/teamspeak/client5.nix
View file

@ -20,7 +20,7 @@
libnotify, libnotify,
libpulseaudio, libpulseaudio,
libxkbcommon, libxkbcommon,
mesa, libgbm,
nss, nss,
udev, udev,
xorg, xorg,
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
libnotify libnotify
libpulseaudio libpulseaudio
libxkbcommon libxkbcommon
mesa libgbm
nss nss
xorg.libX11 xorg.libX11
xorg.libXScrnSaver xorg.libXScrnSaver

6
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
View file

@ -24,7 +24,7 @@
glib, glib,
abseil-cpp, abseil-cpp,
pipewire, pipewire,
mesa, libgbm,
libdrm, libdrm,
libGL, libGL,
apple-sdk_15, apple-sdk_15,
@ -47,7 +47,7 @@ stdenv.mkDerivation {
substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \ substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \
--replace-fail '"libEGL.so.1"' '"${lib.getLib libGL}/lib/libEGL.so.1"' \ --replace-fail '"libEGL.so.1"' '"${lib.getLib libGL}/lib/libEGL.so.1"' \
--replace-fail '"libGL.so.1"' '"${lib.getLib libGL}/lib/libGL.so.1"' \ --replace-fail '"libGL.so.1"' '"${lib.getLib libGL}/lib/libGL.so.1"' \
--replace-fail '"libgbm.so.1"' '"${lib.getLib mesa}/lib/libgbm.so.1"' \ --replace-fail '"libgbm.so.1"' '"${lib.getLib libgbm}/lib/libgbm.so.1"' \
--replace-fail '"libdrm.so.2"' '"${lib.getLib libdrm}/lib/libdrm.so.2"' --replace-fail '"libdrm.so.2"' '"${lib.getLib libdrm}/lib/libdrm.so.2"'
''; '';
@ -85,7 +85,7 @@ stdenv.mkDerivation {
libXi libXi
glib glib
pipewire pipewire
mesa libgbm
libdrm libdrm
libGL libGL
] ]

4
pkgs/applications/networking/p2p/gnunet/default.nix
View file

@ -28,12 +28,12 @@ stdenv.mkDerivation rec {
# /etc/{resolv.conf,hosts}, replace all references to `localhost' # /etc/{resolv.conf,hosts}, replace all references to `localhost'
# by their IPv4 equivalent. # by their IPv4 equivalent.
find . \( -name \*.c -or -name \*.conf \) | \ 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 # Make sure the tests don't rely on `/tmp', for the sake of chroot
# builds. # builds.
find . \( -iname \*test\*.c -or -name \*.conf \) | \ 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 # unfortunately, there's still a few failures with impure tests

4
pkgs/applications/networking/remote/citrix-workspace/generic.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook3, which, more { lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook3, which, more
, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk_4_0, gtk2-x11, gtk3 , file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk_4_0, gtk2-x11, gtk3
, heimdal, krb5, libsoup_2_4, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , heimdal, krb5, libsoup_2_4, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
, gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , gnome2, libgbm, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
, libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin , libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin
, libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4 , libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4
, libfaketime , libfaketime
@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
libvorbis libvorbis
libxml2 libxml2
llvmPackages_12.libunwind llvmPackages_12.libunwind
mesa libgbm
nspr nspr
nss nss
opencv4' opencv4'

17
pkgs/applications/networking/remote/freerdp/default.nix
View file

@ -9,6 +9,7 @@
alsa-lib, alsa-lib,
faac, faac,
faad2, faad2,
fetchpatch,
ffmpeg, ffmpeg,
glib, glib,
openh264, openh264,
@ -88,6 +89,22 @@ stdenv.mkDerivation rec {
hash = "sha256-w+xyMNFmKylSheK0yAGl8J6MXly/HUjjAfR9Qq3s/kA="; 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 = postPatch =
'' ''
export HOME=$TMP export HOME=$TMP

3
pkgs/applications/networking/sync/rsync/default.nix
View file

@ -58,6 +58,9 @@ stdenv.mkDerivation rec {
(lib.enableFeature enableOpenSSL "openssl") (lib.enableFeature enableOpenSSL "openssl")
(lib.enableFeature enableXXHash "xxhash") (lib.enableFeature enableXXHash "xxhash")
(lib.enableFeature enableZstd "zstd") (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" "--with-nobody-group=nogroup"
# disable the included zlib explicitly as it otherwise still compiles and # disable the included zlib explicitly as it otherwise still compiles and

2
pkgs/applications/office/libreoffice/default.nix
View file

@ -461,7 +461,7 @@ in stdenv.mkDerivation (finalAttrs: {
"--enable-dbus" "--enable-dbus"
"--enable-release-build" "--enable-release-build"
"--enable-epm" "--enable-epm"
"--with-ant-home=${getLib ant}/lib/ant" "--with-ant-home=${ant.home}"
# Without these, configure does not finish # Without these, configure does not finish
"--without-junit" "--without-junit"

4
pkgs/applications/office/morgen/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron { lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron
, asar, alsa-lib, gtk3, libxshmfence, mesa, nss }: , asar, alsa-lib, gtk3, libxshmfence, libgbm, nss }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "morgen"; pname = "morgen";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
asar asar
]; ];
buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ]; buildInputs = [ alsa-lib gtk3 libxshmfence libgbm nss ];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall

4
pkgs/applications/office/trilium/desktop.nix
View file

@ -6,7 +6,7 @@
fetchurl, fetchurl,
makeWrapper, makeWrapper,
alsa-lib, alsa-lib,
mesa, libgbm,
nss, nss,
nspr, nspr,
systemd, systemd,
@ -49,7 +49,7 @@ let
buildInputs = [ buildInputs = [
alsa-lib alsa-lib
mesa libgbm
nss nss
nspr nspr
stdenv.cc.cc stdenv.cc.cc

4
pkgs/applications/office/wpsoffice/default.nix
View file

@ -7,7 +7,7 @@
, libtool , libtool
, libxkbcommon , libxkbcommon
, nspr , nspr
, mesa , libgbm
, libtiff , libtiff
, udev , udev
, gtk3 , gtk3
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
libjpeg libjpeg
libxkbcommon libxkbcommon
nspr nspr
mesa libgbm
libtiff libtiff
udev udev
gtk3 gtk3

7
pkgs/applications/radio/gnuradio/default.nix
View file

@ -1,5 +1,6 @@
{ lib, stdenv { lib, stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, cmake , cmake
# Remove gcc and python references # Remove gcc and python references
, removeReferencesTo , removeReferencesTo
@ -292,6 +293,12 @@ stdenv.mkDerivation (finalAttrs: (shared // {
patches = [ patches = [
# Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
./modtool-newmod-permissions.patch ./modtool-newmod-permissions.patch
# https://github.com/gnuradio/gnuradio/issues/7458
(fetchpatch {
name = "gnuradio-numpy_2-compatibility.patch";
url = "https://github.com/gnuradio/gnuradio/commit/8fbc5eb4b7214a4cb029ccae97205a85d49bdd48.patch";
hash = "sha256-xYvjlyZ/Bcn23gT3EOee/GhkXzdpA+q33LgURVWOUQI=";
})
]; ];
passthru = shared.passthru // { passthru = shared.passthru // {
# Deps that are potentially overridden and are used inside GR plugins - the same version must # Deps that are potentially overridden and are used inside GR plugins - the same version must

6
pkgs/applications/science/misc/boinc/default.nix
View file

@ -72,12 +72,14 @@ stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
./_autosetup ./_autosetup
configureFlags="$configureFlags --sysconfdir=$out/etc"
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;
configureFlags = [ "--disable-server" ] ++ lib.optionals headless [ "--disable-manager" ]; configureFlags = [
"--disable-server"
"--sysconfdir=${placeholder "out"}/etc"
] ++ lib.optionals headless [ "--disable-manager" ];
postInstall = '' postInstall = ''
install --mode=444 -D 'client/scripts/boinc-client.service' "$out/etc/systemd/system/boinc.service" install --mode=444 -D 'client/scripts/boinc-client.service' "$out/etc/systemd/system/boinc.service"

4
pkgs/applications/science/physics/crystfel/default.nix
View file

@ -32,7 +32,6 @@
gtk3, gtk3,
gdk-pixbuf, gdk-pixbuf,
argp-standalone, argp-standalone,
memorymappingHook,
withGui ? true, withGui ? true,
withBitshuffle ? true, withBitshuffle ? true,
}: }:
@ -254,9 +253,6 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
argp-standalone argp-standalone
] ]
++ lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64) [
memorymappingHook
]
++ lib.optionals withBitshuffle [ hdf5-external-filter-plugins ]; ++ lib.optionals withBitshuffle [ hdf5-external-filter-plugins ];
patches = [ patches = [

4
pkgs/applications/terminal-emulators/mlterm/default.nix
View file

@ -165,14 +165,14 @@ stdenv.mkDerivation (finalAttrs: {
#bad configure.ac and Makefile.in everywhere #bad configure.ac and Makefile.in everywhere
preConfigure = '' 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 \ main/Makefile.in \
tool/mlfc/Makefile.in \ tool/mlfc/Makefile.in \
tool/mlimgloader/Makefile.in \ tool/mlimgloader/Makefile.in \
tool/mlconfig/Makefile.in \ tool/mlconfig/Makefile.in \
uitoolkit/libtype/Makefile.in \ uitoolkit/libtype/Makefile.in \
uitoolkit/libotl/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 tool/mlconfig/po/Makefile.in.in
#utmp and mlterm-fb #utmp and mlterm-fb
substituteInPlace configure.in \ substituteInPlace configure.in \

32
pkgs/applications/terminal-emulators/wezterm/default.nix
View file

@ -20,15 +20,10 @@
xcbutilwm, xcbutilwm,
wayland, wayland,
zlib, zlib,
CoreGraphics,
Cocoa,
Foundation,
System,
libiconv,
UserNotifications,
nixosTests, nixosTests,
runCommand, runCommand,
vulkan-loader, vulkan-loader,
fetchpatch2,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -43,6 +38,21 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-Az+HlnK/lRJpUSGm5UKyma1l2PaBKNCGFiaYnLECMX8="; hash = "sha256-Az+HlnK/lRJpUSGm5UKyma1l2PaBKNCGFiaYnLECMX8=";
}; };
patches = [
# Remove unused `fdopen` in vendored zlib, which causes compilation failures with clang 19 on Darwin.
# Ref: https://github.com/madler/zlib/commit/4bd9a71f3539b5ce47f0c67ab5e01f3196dc8ef9
./zlib-fdopen.patch
# Fix platform check in vendored libpng with clang 19 on Darwin.
(fetchpatch2 {
url = "https://github.com/pnggroup/libpng/commit/893b8113f04d408cc6177c6de19c9889a48faa24.patch?full_index=1";
extraPrefix = "deps/freetype/libpng/";
stripLen = 1;
excludes = [ "deps/freetype/libpng/AUTHORS" ];
hash = "sha256-zW/oUo2EGcnsxAfbbbhTKGui/lwCqovyrvUnylfRQzc=";
})
];
postPatch = '' postPatch = ''
cp ${./Cargo.lock} Cargo.lock cp ${./Cargo.lock} Cargo.lock
@ -88,20 +98,10 @@ rustPlatform.buildRustPackage rec {
xcbutilimage xcbutilimage
xcbutilkeysyms xcbutilkeysyms
xcbutilwm # contains xcb-ewmh among others xcbutilwm # contains xcb-ewmh among others
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
Cocoa
CoreGraphics
Foundation
libiconv
System
UserNotifications
]; ];
buildFeatures = [ "distro-defaults" ]; buildFeatures = [ "distro-defaults" ];
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework System";
postInstall = '' postInstall = ''
mkdir -p $out/nix-support mkdir -p $out/nix-support
echo "${passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages echo "${passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages

24
pkgs/applications/terminal-emulators/wezterm/zlib-fdopen.patch Normal file
View file

@ -0,0 +1,24 @@
Submodule deps/freetype/zlib contains modified content
diff --git a/deps/freetype/zlib/zutil.h b/deps/freetype/zlib/zutil.h
index b079ea6..4e94f2f 100644
--- a/deps/freetype/zlib/zutil.h
+++ b/deps/freetype/zlib/zutil.h
@@ -130,17 +130,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
# endif
#endif
-#if defined(MACOS) || defined(TARGET_OS_MAC)
+#if defined(MACOS)
# define OS_CODE 7
-# ifndef Z_SOLO
-# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-# include <unix.h> /* for fdopen */
-# else
-# ifndef fdopen
-# define fdopen(fd,mode) NULL /* No fdopen() */
-# endif
-# endif
-# endif
#endif
#ifdef __acorn

2
pkgs/applications/version-management/monotone-viz/default.nix
View file

@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
]; ];
preConfigure = '' 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 = '' postInstall = ''

2
pkgs/applications/version-management/sourcehut/default.nix
View file

@ -46,6 +46,7 @@ let
flask flask
sqlalchemy sqlalchemy
]; ];
disabledTests = [ "test_persist_selectable" ];
}); });
# flask-sqlalchemy 2.x requires flask 2.x # flask-sqlalchemy 2.x requires flask 2.x
@ -73,6 +74,7 @@ let
hash = "sha256-83doVvfdpymlAB0EbfrHmuoKE5B2LJbFq+AY2xGpnl4="; hash = "sha256-83doVvfdpymlAB0EbfrHmuoKE5B2LJbFq+AY2xGpnl4=";
}) })
]; ];
nativeCheckInputs = oldAttrs.nativeCheckInputs or [ ] ++ [ self.pytest-xprocess ];
}); });
# sourcehut is not (yet) compatible with factory-boy 3.x # sourcehut is not (yet) compatible with factory-boy 3.x

5
pkgs/applications/version-management/vcprompt/default.nix
View file

@ -23,9 +23,12 @@ stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
autoconf autoconf
makeFlags="$makeFlags PREFIX=$out"
''; '';
makeFlags = [
"PREFIX=${placeholder "out"}"
];
meta = with lib; { meta = with lib; {
description = '' description = ''
A little C program that prints a short string with barebones information A little C program that prints a short string with barebones information

14
pkgs/applications/video/kodi/unwrapped.nix
View file

@ -18,7 +18,7 @@
, libcrossguid, libmicrohttpd , libcrossguid, libmicrohttpd
, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn2, libpthreadstubs, libtasn1 , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn2, libpthreadstubs, libtasn1
, libplist, p11-kit, zlib, flatbuffers, fstrcmp, rapidjson , libplist, p11-kit, zlib, flatbuffers, fstrcmp, rapidjson
, lirc , lirc, mesa
, x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp , x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp
, dbusSupport ? true, dbus , dbusSupport ? true, dbus
, joystickSupport ? true, cwiid , joystickSupport ? true, cwiid
@ -33,7 +33,7 @@
, vdpauSupport ? true, libvdpau , vdpauSupport ? true, libvdpau
, waylandSupport ? false, wayland, wayland-protocols , waylandSupport ? false, wayland, wayland-protocols
, waylandpp ? null, libxkbcommon , waylandpp ? null, libxkbcommon
, gbmSupport ? false, mesa, libinput, libdisplay-info , gbmSupport ? false, libgbm, libinput, libdisplay-info
, buildPackages , buildPackages
}: }:
@ -126,7 +126,7 @@ in stdenv.mkDerivation (finalAttrs: {
bluez giflib glib harfbuzz lcms2 libpthreadstubs bluez giflib glib harfbuzz lcms2 libpthreadstubs
ffmpeg flatbuffers fstrcmp rapidjson ffmpeg flatbuffers fstrcmp rapidjson
lirc lirc
mesa # for libEGL mesa # uses eglext_angle.h, which is not provided by glvnd
] ]
++ lib.optionals x11Support [ ++ lib.optionals x11Support [
libX11 xorgproto libXt libXmu libXext.dev libXdmcp libX11 xorgproto libXt libXmu libXext.dev libXdmcp
@ -151,7 +151,7 @@ in stdenv.mkDerivation (finalAttrs: {
] ]
++ lib.optionals gbmSupport [ ++ lib.optionals gbmSupport [
libxkbcommon.dev libxkbcommon.dev
mesa.dev libgbm
libinput.dev libinput.dev
libdisplay-info libdisplay-info
]; ];
@ -190,7 +190,7 @@ in stdenv.mkDerivation (finalAttrs: {
"-DENABLE_OPTICAL=${if opticalSupport then "ON" else "OFF"}" "-DENABLE_OPTICAL=${if opticalSupport then "ON" else "OFF"}"
"-DENABLE_VDPAU=${if vdpauSupport then "ON" else "OFF"}" "-DENABLE_VDPAU=${if vdpauSupport then "ON" else "OFF"}"
"-DLIRC_DEVICE=/run/lirc/lircd" "-DLIRC_DEVICE=/run/lirc/lircd"
"-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig" "-DSWIG_EXECUTABLE=${buildPackages.swig3}/bin/swig"
"-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc" "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc"
"-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python" "-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python"
"-DPYTHON_LIB_PATH=${python3Packages.python.sitePackages}" "-DPYTHON_LIB_PATH=${python3Packages.python.sitePackages}"
@ -214,10 +214,10 @@ in stdenv.mkDerivation (finalAttrs: {
# Need these tools on the build system when cross compiling, # Need these tools on the build system when cross compiling,
# hacky, but have found no other way. # hacky, but have found no other way.
CXX=$CXX_FOR_BUILD LD=ld make -C tools/depends/native/JsonSchemaBuilder 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 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"
''; '';
postInstall = '' postInstall = ''

4
pkgs/applications/video/mpv/default.nix
View file

@ -39,7 +39,7 @@
libxkbcommon, libxkbcommon,
lua, lua,
makeWrapper, makeWrapper,
mesa, libgbm,
meson, meson,
mujs, mujs,
ninja, ninja,
@ -187,7 +187,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals cmsSupport [ lcms2 ] ++ lib.optionals cmsSupport [ lcms2 ]
++ lib.optionals drmSupport [ ++ lib.optionals drmSupport [
libdrm libdrm
mesa libgbm
] ]
++ lib.optionals dvdnavSupport [ ++ lib.optionals dvdnavSupport [
libdvdnav libdvdnav

4
pkgs/applications/video/streamlink-twitch-gui/bin.nix
View file

@ -20,7 +20,7 @@
, gtk3-x11 , gtk3-x11
, libudev0-shim , libudev0-shim
, libuuid , libuuid
, mesa , libgbm
, nss , nss
, nspr , nspr
, xorg , xorg
@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
glib glib
pango pango
gtk3-x11 gtk3-x11
mesa libgbm
nss nss
nspr nspr
libuuid libuuid

4
pkgs/applications/virtualization/qemu/default.nix
View file

@ -22,7 +22,7 @@
, xenSupport ? false, xen , xenSupport ? false, xen
, cephSupport ? false, ceph , cephSupport ? false, ceph
, glusterfsSupport ? false, glusterfs, libuuid , glusterfsSupport ? false, glusterfs, libuuid
, openGLSupport ? sdlSupport, mesa, libepoxy, libdrm , openGLSupport ? sdlSupport, libgbm, libepoxy, libdrm
, rutabagaSupport ? openGLSupport && !minimal && lib.meta.availableOn stdenv.hostPlatform rutabaga_gfx, rutabaga_gfx , rutabagaSupport ? openGLSupport && !minimal && lib.meta.availableOn stdenv.hostPlatform rutabaga_gfx, rutabaga_gfx
, virglSupport ? openGLSupport, virglrenderer , virglSupport ? openGLSupport, virglrenderer
, libiscsiSupport ? !minimal, libiscsi , libiscsiSupport ? !minimal, libiscsi
@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals xenSupport [ xen ] ++ lib.optionals xenSupport [ xen ]
++ lib.optionals cephSupport [ ceph ] ++ lib.optionals cephSupport [ ceph ]
++ lib.optionals glusterfsSupport [ glusterfs libuuid ] ++ lib.optionals glusterfsSupport [ glusterfs libuuid ]
++ lib.optionals openGLSupport [ mesa libepoxy libdrm ] ++ lib.optionals openGLSupport [ libgbm libepoxy libdrm ]
++ lib.optionals rutabagaSupport [ rutabaga_gfx ] ++ lib.optionals rutabagaSupport [ rutabaga_gfx ]
++ lib.optionals virglSupport [ virglrenderer ] ++ lib.optionals virglSupport [ virglrenderer ]
++ lib.optionals libiscsiSupport [ libiscsi ] ++ lib.optionals libiscsiSupport [ libiscsi ]

2
pkgs/applications/window-managers/cage/default.nix
View file

@ -17,7 +17,6 @@
systemd, systemd,
libGL, libGL,
libX11, libX11,
mesa,
xwayland ? null, xwayland ? null,
nixosTests, nixosTests,
}: }:
@ -53,7 +52,6 @@ stdenv.mkDerivation rec {
pixman pixman
libxkbcommon libxkbcommon
xcbutilwm xcbutilwm
mesa # for libEGL headers
systemd systemd
libGL libGL
libX11 libX11

4
pkgs/applications/window-managers/cagebreak/default.nix
View file

@ -4,12 +4,12 @@
fetchFromGitHub, fetchFromGitHub,
cairo, cairo,
fontconfig, fontconfig,
libdrm,
libevdev, libevdev,
libinput, libinput,
libxkbcommon, libxkbcommon,
xcbutilwm, xcbutilwm,
makeWrapper, makeWrapper,
mesa,
meson, meson,
ninja, ninja,
nixosTests, nixosTests,
@ -49,11 +49,11 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
cairo cairo
fontconfig fontconfig
libdrm
libevdev libevdev
libinput libinput
libxkbcommon libxkbcommon
xcbutilwm xcbutilwm
mesa # for libEGL headers
pango pango
pixman pixman
systemd systemd

4
pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
View file

@ -13,7 +13,7 @@
hyprutils, hyprutils,
hyprwayland-scanner, hyprwayland-scanner,
libdrm, libdrm,
mesa, libgbm,
pipewire, pipewire,
qtbase, qtbase,
qttools, qttools,
@ -53,7 +53,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
hyprlang hyprlang
hyprutils hyprutils
libdrm libdrm
mesa libgbm
pipewire pipewire
qtbase qtbase
qttools qttools

4
pkgs/applications/window-managers/sommelier/default.nix
View file

@ -9,7 +9,7 @@
python3Packages, python3Packages,
wayland-scanner, wayland-scanner,
libxkbcommon, libxkbcommon,
mesa, libgbm,
pixman, pixman,
xorg, xorg,
wayland, wayland,
@ -37,7 +37,7 @@ stdenv.mkDerivation {
]; ];
buildInputs = [ buildInputs = [
libxkbcommon libxkbcommon
mesa libgbm
pixman pixman
wayland wayland
xorg.libxcb xorg.libxcb

5
pkgs/build-support/appimage/default.nix
View file

@ -29,7 +29,8 @@ rec {
extract = args@{ pname, version, name ? null, postExtract ? "", src, ... }: 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."; assert lib.assertMsg (name == null) "The `name` argument is deprecated. Use `pname` and `version` instead to construct the name.";
pkgs.runCommand "${pname}-${version}-extracted" { pkgs.runCommand "${pname}-${version}-extracted" {
buildInputs = [ appimage-exec ]; nativeBuildInputs = [ appimage-exec ];
strictDeps = true;
} '' } ''
appimage-exec.sh -x $out ${src} appimage-exec.sh -x $out ${src}
${postExtract} ${postExtract}
@ -159,7 +160,7 @@ rec {
libidn libidn
tbb tbb
wayland wayland
mesa libgbm
libxkbcommon libxkbcommon
vulkan-loader vulkan-loader

4
pkgs/build-support/bintools-wrapper/default.nix
View file

@ -343,10 +343,6 @@ stdenvNoCC.mkDerivation {
done done
'' ''
+ optionalString targetPlatform.isDarwin ''
echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags
''
## ##
## GNU specific extra strip flags ## GNU specific extra strip flags
## ##

27
pkgs/build-support/buildenv/builder.pl
View file

@ -77,7 +77,7 @@ for my $p (@pathsToLink) {
sub findFiles; sub findFiles;
sub findFilesInDir { sub findFilesInDir {
my ($relName, $target, $ignoreCollisions, $checkCollisionContents, $priority) = @_; my ($relName, $target, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority) = @_;
opendir DIR, "$target" or die "cannot open `$target': $!"; opendir DIR, "$target" or die "cannot open `$target': $!";
my @names = readdir DIR or die; my @names = readdir DIR or die;
@ -85,7 +85,7 @@ sub findFilesInDir {
foreach my $name (@names) { foreach my $name (@names) {
next if $name eq "." || $name eq ".."; 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 { 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) { 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... # Urgh, hacky...
@ -188,8 +193,8 @@ sub findFiles {
} }
} }
findFilesInDir($relName, $oldTarget, $ignoreCollisions, $checkCollisionContents, $oldPriority) unless $oldTarget eq ""; findFilesInDir($relName, $oldTarget, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $oldPriority) unless $oldTarget eq "";
findFilesInDir($relName, $target, $ignoreCollisions, $checkCollisionContents, $priority); findFilesInDir($relName, $target, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority);
$symlinks{$relName} = ["", $priority]; # denotes directory $symlinks{$relName} = ["", $priority]; # denotes directory
} }
@ -199,12 +204,12 @@ my %done;
my %postponed; my %postponed;
sub addPkg { sub addPkg {
my ($pkgDir, $ignoreCollisions, $checkCollisionContents, $priority) = @_; my ($pkgDir, $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority) = @_;
return if (defined $done{$pkgDir}); return if (defined $done{$pkgDir});
$done{$pkgDir} = 1; $done{$pkgDir} = 1;
findFiles("", $pkgDir, "", $ignoreCollisions, $checkCollisionContents, $priority); findFiles("", $pkgDir, "", $ignoreCollisions, $ignoreSingleFileOutputs, $checkCollisionContents, $priority);
my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages"; my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages";
if (-e $propagatedFN) { if (-e $propagatedFN) {
@ -235,6 +240,7 @@ for my $pkg (@{decode_json $pkgs}) {
for my $path (@{$pkg->{paths}}) { for my $path (@{$pkg->{paths}}) {
addPkg($path, addPkg($path,
$ENV{"ignoreCollisions"} eq "1", $ENV{"ignoreCollisions"} eq "1",
$ENV{"ignoreSingleFileOutputs"} eq "1",
$ENV{"checkCollisionContents"} eq "1", $ENV{"checkCollisionContents"} eq "1",
$pkg->{priority}) $pkg->{priority})
if -e $path; if -e $path;
@ -251,7 +257,7 @@ while (scalar(keys %postponed) > 0) {
my @pkgDirs = keys %postponed; my @pkgDirs = keys %postponed;
%postponed = (); %postponed = ();
foreach my $pkgDir (sort @pkgDirs) { foreach my $pkgDir (sort @pkgDirs) {
addPkg($pkgDir, 2, $ENV{"checkCollisionContents"} eq "1", $priorityCounter++); addPkg($pkgDir, 2, $ENV{"ignoreSingleFileOutputs"} eq "1", $ENV{"checkCollisionContents"} eq "1", $priorityCounter++);
} }
} }
@ -263,6 +269,7 @@ if ($extraPathsFilePath) {
chomp $line; chomp $line;
addPkg($line, addPkg($line,
$ENV{"ignoreCollisions"} eq "1", $ENV{"ignoreCollisions"} eq "1",
$ENV{"ignoreSingleFileOutputs"} eq "1",
$ENV{"checkCollisionContents"} eq "1", $ENV{"checkCollisionContents"} eq "1",
1000) 1000)
if -d $line; if -d $line;

54
pkgs/build-support/buildenv/default.nix
View file

@ -30,6 +30,9 @@ lib.makeOverridable (
# Whether to ignore collisions or abort. # Whether to ignore collisions or abort.
ignoreCollisions ? false, 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. # Whether to include closures of all input paths.
includeClosures ? false, includeClosures ? false,
@ -58,6 +61,8 @@ lib.makeOverridable (
passthru ? { }, passthru ? { },
meta ? { }, meta ? { },
pname ? null,
version ? null,
}: }:
let let
chosenOutputs = map (drv: { chosenOutputs = map (drv: {
@ -86,26 +91,35 @@ lib.makeOverridable (
]; ];
in in
runCommand name runCommand name
rec { (
inherit rec {
manifest inherit
ignoreCollisions manifest
checkCollisionContents ignoreCollisions
passthru checkCollisionContents
meta ignoreSingleFileOutputs
pathsToLink passthru
extraPrefix meta
postBuild pathsToLink
nativeBuildInputs extraPrefix
buildInputs postBuild
; nativeBuildInputs
pkgs = builtins.toJSON chosenOutputs; buildInputs
extraPathsFrom = lib.optional includeClosures (writeClosure pathsForClosure); ;
preferLocalBuild = true; pkgs = builtins.toJSON chosenOutputs;
allowSubstitutes = false; extraPathsFrom = lib.optional includeClosures (writeClosure pathsForClosure);
# XXX: The size is somewhat arbitrary preferLocalBuild = true;
passAsFile = if builtins.stringLength pkgs >= 128 * 1024 then [ "pkgs" ] else [ ]; 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} ${buildPackages.perl}/bin/perl -w ${builder}
eval "$postBuild" eval "$postBuild"

18
pkgs/build-support/cc-wrapper/default.nix
View file

@ -629,6 +629,20 @@ stdenvNoCC.mkDerivation {
echo " -L${libcxx_solib}" >> $out/nix-support/cc-ldflags 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 ## Man page and info support
## ##
@ -682,10 +696,6 @@ stdenvNoCC.mkDerivation {
done done
'' ''
+ optionalString targetPlatform.isDarwin ''
echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags
''
+ optionalString targetPlatform.isAndroid '' + optionalString targetPlatform.isAndroid ''
echo "-D__ANDROID_API__=${targetPlatform.androidSdkVersion}" >> $out/nix-support/cc-cflags echo "-D__ANDROID_API__=${targetPlatform.androidSdkVersion}" >> $out/nix-support/cc-cflags
'' ''

1
pkgs/build-support/docker/default.nix
View file

@ -26,7 +26,6 @@
, skopeo , skopeo
, stdenv , stdenv
, storeDir ? builtins.storeDir , storeDir ? builtins.storeDir
, substituteAll
, symlinkJoin , symlinkJoin
, tarsum , tarsum
, util-linux , util-linux

1
pkgs/build-support/dotnet/build-dotnet-module/default.nix
View file

@ -3,7 +3,6 @@
runtimeShell, runtimeShell,
stdenvNoCC, stdenvNoCC,
callPackage, callPackage,
substituteAll,
writeShellScript, writeShellScript,
makeWrapper, makeWrapper,
dotnetCorePackages, dotnetCorePackages,

15
pkgs/build-support/go/module.nix
View file

@ -48,10 +48,6 @@
# Go build flags. # Go build flags.
, GOFLAGS ? [ ] , GOFLAGS ? [ ]
# Needed for buildFlags{,Array} warning
, buildFlags ? "" # deprecated
, buildFlagsArray ? "" # deprecated
, ... , ...
}@args': }@args':
@ -223,8 +219,6 @@ in
''); '');
buildPhase = args.buildPhase or ( 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) lib.warnIf (builtins.elem "-buildid=" ldflags)
"`-buildid=` is set by default as ldflag by buildGoModule" "`-buildid=` is set by default as ldflag by buildGoModule"
'' ''
@ -242,12 +236,13 @@ in
buildGoDir() { buildGoDir() {
local cmd="$1" dir="$2" local cmd="$1" dir="$2"
declare -ga buildFlagsArray
declare -a flags declare -a flags
flags+=($buildFlags "''${buildFlagsArray[@]}")
flags+=(''${tags:+-tags=''${tags// /,}}) flags+=(''${tags:+-tags=''${tags// /,}})
flags+=(''${ldflags:+-ldflags="$ldflags"}) flags+=(''${ldflags:+-ldflags="$ldflags"})
flags+=("-p" "$NIX_BUILD_CORES") flags+=("-p" "$NIX_BUILD_CORES")
if (( "''${NIX_DEBUG:-0}" >= 1 )); then
flags+=(-x)
fi
if [ "$cmd" = "test" ]; then if [ "$cmd" = "test" ]; then
flags+=(-vet=off) flags+=(-vet=off)
@ -277,10 +272,6 @@ in
fi fi
} }
if (( "''${NIX_DEBUG:-0}" >= 1 )); then
buildFlagsArray+=(-x)
fi
if [ -z "$enableParallelBuilding" ]; then if [ -z "$enableParallelBuilding" ]; then
export NIX_BUILD_CORES=1 export NIX_BUILD_CORES=1
fi fi

32
pkgs/build-support/node/fetch-npm-deps/src/util.rs
View file

@ -1,3 +1,4 @@
use anyhow::bail;
use backoff::{retry, ExponentialBackoff}; use backoff::{retry, ExponentialBackoff};
use data_encoding::BASE64; use data_encoding::BASE64;
use digest::Digest; use digest::Digest;
@ -5,6 +6,7 @@ use isahc::{
config::{CaCertificate, Configurable, RedirectPolicy, SslOption}, config::{CaCertificate, Configurable, RedirectPolicy, SslOption},
Body, Request, RequestExt, Body, Request, RequestExt,
}; };
use log::info;
use nix_nar::{Encoder, NarError}; use nix_nar::{Encoder, NarError};
use serde_json::{Map, Value}; use serde_json::{Map, Value};
use sha2::Sha256; use sha2::Sha256;
@ -15,7 +17,7 @@ use std::{
}; };
use url::Url; use url::Url;
pub fn get_url(url: &Url) -> Result<Body, isahc::Error> { pub fn get_url(url: &Url) -> Result<Body, anyhow::Error> {
let mut request = Request::get(url.as_str()).redirect_policy(RedirectPolicy::Limit(10)); let mut request = Request::get(url.as_str()).redirect_policy(RedirectPolicy::Limit(10));
// Respect SSL_CERT_FILE if environment variable exists // Respect SSL_CERT_FILE if environment variable exists
@ -37,16 +39,27 @@ pub fn get_url(url: &Url) -> Result<Body, isahc::Error> {
if let Ok(npm_tokens) = env::var("NIX_NPM_TOKENS") { if let Ok(npm_tokens) = env::var("NIX_NPM_TOKENS") {
if let Ok(tokens) = serde_json::from_str::<Map<String, Value>>(&npm_tokens) { if let Ok(tokens) = serde_json::from_str::<Map<String, Value>>(&npm_tokens) {
if let Some(token) = tokens.get(host).and_then(serde_json::Value::as_str) { if let Some(token) = tokens.get(host).and_then(serde_json::Value::as_str) {
info!("Found NPM token for {}. Adding authorization header to request.", host);
request = request.header("Authorization", format!("Bearer {token}")); request = request.header("Authorization", format!("Bearer {token}"));
} }
} }
} }
} }
Ok(request.body(())?.send()?.into_body()) let res = request.body(())?.send()?;
if !res.status().is_success() {
if res.status().is_client_error() {
bail!("Client error: {}", res.status());
}
if res.status().is_server_error() {
bail!("Server error: {}", res.status());
}
bail!("{}", res.status());
}
Ok(res.into_body())
} }
pub fn get_url_body_with_retry(url: &Url) -> Result<Vec<u8>, isahc::Error> { pub fn get_url_body_with_retry(url: &Url) -> Result<Vec<u8>, anyhow::Error> {
retry(ExponentialBackoff::default(), || { retry(ExponentialBackoff::default(), || {
get_url(url) get_url(url)
.and_then(|mut body| { .and_then(|mut body| {
@ -56,12 +69,15 @@ pub fn get_url_body_with_retry(url: &Url) -> Result<Vec<u8>, isahc::Error> {
Ok(buf) Ok(buf)
}) })
.map_err(|err| { .map_err(|err| match err.downcast_ref::<isahc::Error>() {
if err.is_network() || err.is_timeout() { Some(isahc_err) => {
backoff::Error::transient(err) if isahc_err.is_network() || isahc_err.is_timeout() {
} else { backoff::Error::transient(err)
backoff::Error::permanent(err) } else {
backoff::Error::permanent(err)
}
} }
None => backoff::Error::permanent(err),
}) })
}) })
.map_err(|backoff_err| match backoff_err { .map_err(|backoff_err| match backoff_err {

4
pkgs/build-support/php/builders/v1/hooks/php-script-utils.bash
View file

@ -24,9 +24,9 @@ checkComposerValidate() {
setComposerRootVersion setComposerRootVersion
if [ "1" == "${composerGlobal-}" ]; then if [ "1" == "${composerGlobal-}" ]; then
global="global"; global="global";
else else
global=""; global="";
fi fi
command="composer ${global} validate --strict --quiet --no-interaction --no-check-all --no-check-lock" command="composer ${global} validate --strict --quiet --no-interaction --no-check-all --no-check-lock"

4
pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash
View file

@ -22,9 +22,9 @@ setComposerEnvVariables() {
checkComposerValidate() { checkComposerValidate() {
if [ "1" == "${composerGlobal-}" ]; then if [ "1" == "${composerGlobal-}" ]; then
global="global"; global="global";
else else
global=""; global="";
fi fi
command="composer ${global} validate --strict --quiet --no-interaction --no-check-all --no-check-lock" command="composer ${global} validate --strict --quiet --no-interaction --no-check-all --no-check-lock"

2
pkgs/build-support/release/binary-tarball.nix
View file

@ -54,7 +54,7 @@ stdenv.mkDerivation (
# Prefix hackery because of a bug in stdenv (it tries to `mkdir # Prefix hackery because of a bug in stdenv (it tries to `mkdir
# $prefix', which doesn't work due to the DESTDIR). # $prefix', which doesn't work due to the DESTDIR).
configureFlags="--prefix=$prefix $configureFlags" prependToVar configureFlags "--prefix=$prefix"
dontAddPrefix=1 dontAddPrefix=1
prefix=$TMPDIR/inst$prefix prefix=$TMPDIR/inst$prefix
''; '';

31
pkgs/build-support/replace-vars/default.nix
View file

@ -11,8 +11,8 @@
Any unmatched variable names in the file at the provided path will cause a build failure. 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 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. has occurred will cause a build failure. Variables can be excluded from this check by passing "null" for them.
# Inputs # Inputs
@ -20,7 +20,8 @@
: The file in which to replace variables. : The file in which to replace variables.
`attrs` (AttrsOf String) `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 # Example
@ -36,13 +37,19 @@ path: attrs:
let let
# We use `--replace-fail` instead of `--subst-var-by` so that if the thing isn't there, we fail. # We use `--replace-fail` instead of `--subst-var-by` so that if the thing isn't there, we fail.
subst-var-by = name: value: [ subst-var-by =
"--replace-fail" name: value:
(lib.escapeShellArg "@${name}@") lib.optionals (value != null) [
(lib.escapeShellArg value) "--replace-fail"
]; (lib.escapeShellArg "@${name}@")
(lib.escapeShellArg value)
];
replacements = lib.concatLists (lib.mapAttrsToList subst-var-by attrs); replacements = lib.concatLists (lib.mapAttrsToList subst-var-by attrs);
left-overs = map ({ name, ... }: name) (
builtins.filter ({ value, ... }: value == null) (lib.attrsToList attrs)
);
in in
stdenvNoCC.mkDerivation { stdenvNoCC.mkDerivation {
@ -62,13 +69,15 @@ stdenvNoCC.mkDerivation {
# Look for Nix identifiers surrounded by `@` that aren't substituted. # Look for Nix identifiers surrounded by `@` that aren't substituted.
checkPhase = checkPhase =
let 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 in
'' ''
runHook preCheck 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": 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. echo Use the more precise '`substitute`' function if this check is in error.
exit 1 exit 1
fi fi

2
pkgs/build-support/rust/build-rust-package/default.nix
View file

@ -172,8 +172,6 @@ stdenv.mkDerivation (
cargoCheckFeatures = checkFeatures; cargoCheckFeatures = checkFeatures;
patchRegistryDeps = ./patch-registry-deps;
nativeBuildInputs = nativeBuildInputs =
nativeBuildInputs nativeBuildInputs
++ lib.optionals auditable [ ++ lib.optionals auditable [

8
pkgs/build-support/rust/build-rust-package/patch-registry-deps/pkg-config
View file

@ -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

4
pkgs/build-support/testers/default.nix
View file

@ -10,7 +10,7 @@
runCommandWith, runCommandWith,
stdenv, stdenv,
stdenvNoCC, stdenvNoCC,
substituteAll, replaceVars,
testers, testers,
}: }:
# Documentation is in doc/build-helpers/testers.chapter.md # Documentation is in doc/build-helpers/testers.chapter.md
@ -24,7 +24,7 @@
testBuildFailure = drv: drv.overrideAttrs (orig: { testBuildFailure = drv: drv.overrideAttrs (orig: {
builder = buildPackages.bash; builder = buildPackages.bash;
args = [ args = [
(substituteAll { coreutils = buildPackages.coreutils; src = ./expect-failure.sh; }) (replaceVars ./expect-failure.sh { coreutils = buildPackages.coreutils; })
orig.realBuilder or stdenv.shell orig.realBuilder or stdenv.shell
] ++ orig.args or ["-e" (orig.builder or ../../stdenv/generic/default-builder.sh)]; ] ++ orig.args or ["-e" (orig.builder or ../../stdenv/generic/default-builder.sh)];
}); });

21
pkgs/by-name/ad/adns/darwin.patch Normal file
View file

@ -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'

50
pkgs/by-name/ad/adns/package.nix
View file

@ -1,52 +1,48 @@
{ {
stdenv,
lib, lib,
stdenv,
fetchurl, fetchurl,
gnum4, gnum4,
autoreconfHook,
gitUpdater, gitUpdater,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "adns"; pname = "adns";
version = "1.6.1"; version = "1.6.1";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz" "https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${finalAttrs.version}.tar.gz"
"mirror://gnu/adns/adns-${version}.tar.gz" "mirror://gnu/adns/adns-${finalAttrs.version}.tar.gz"
]; ];
hash = "sha256-cTizeJt1Br1oP0UdT32FMHepGAO3s12G7GZ/D5zUAc0="; 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"; configureFlags = lib.optional stdenv.hostPlatform.isStatic "--disable-dynamic";
preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure"; enableParallelBuilding = true;
# Autogenerated headers miss interdependencies in Makefile, fail parallel build:
# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51329
enableParallelBuilding = false;
# https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01347.html for details. # https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01347.html for details.
doCheck = false; doCheck = false;
postInstall = doInstallCheck = true;
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}
'';
# darwin executables fail, but I don't want to fail the 100-500 packages depending on this lib
doInstallCheck = !stdenv.hostPlatform.isDarwin;
installCheckPhase = '' installCheckPhase = ''
set -eo pipefail runHook preInstallCheck
for prog in $out/bin/*; do for prog in $out/bin/*; do
$prog --help > /dev/null && echo $(basename $prog) shows usage $prog --help > /dev/null && echo $(basename $prog) shows usage
done done
runHook postInstallCheck
''; '';
passthru.updateScript = gitUpdater { passthru.updateScript = gitUpdater {
@ -54,11 +50,15 @@ stdenv.mkDerivation rec {
rev-prefix = "adns-"; rev-prefix = "adns-";
}; };
meta = with lib; { meta = {
homepage = "http://www.chiark.greenend.org.uk/~ian/adns/"; homepage = "http://www.chiark.greenend.org.uk/~ian/adns/";
description = "Asynchronous DNS Resolver Library"; description = "Asynchronous DNS resolver library";
license = licenses.lgpl2; license = [
lib.licenses.gpl3Plus
platforms = platforms.unix; # `adns.h` only
lib.licenses.lgpl2Plus
];
platforms = lib.platforms.unix;
}; };
} })

4
pkgs/by-name/ad/adriconf/package.nix
View file

@ -10,7 +10,7 @@
pcre, pcre,
gtkmm4, gtkmm4,
pugixml, pugixml,
mesa, libgbm,
pciutils, pciutils,
}: }:
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
pcre pcre
gtkmm4 gtkmm4
pugixml pugixml
mesa libgbm
pciutils pciutils
]; ];

4
pkgs/by-name/ae/aether-lv2/package.nix
View file

@ -6,7 +6,7 @@
libX11, libX11,
libGL, libGL,
libGLU, libGLU,
mesa, libgbm,
cmake, cmake,
}: }:
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
libX11 libX11
libGL libGL
libGLU libGLU
mesa libgbm
]; ];
env.NIX_CFLAGS_COMPILE = toString [ env.NIX_CFLAGS_COMPILE = toString [

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