staging-next 2024-10-15 (#348827)
This commit is contained in:
Vladimír Čunát
@@ -1,4 +0,0 @@
|
||||
# Use ci/OWNERS instead
|
||||
#
|
||||
# This file would be for the native code owner feature of GitHub,
|
||||
# but is not being used because of its problems, see ci/OWNERS
|
||||
@@ -58,7 +58,7 @@
|
||||
/pkgs/build-support/bintools-wrapper @Ericson2314
|
||||
/pkgs/build-support/setup-hooks @Ericson2314
|
||||
/pkgs/build-support/setup-hooks/auto-patchelf.sh @layus
|
||||
/pkgs/build-support/setup-hooks/auto-patchelf.py @layus
|
||||
/pkgs/by-name/au/auto-patchelf @layus
|
||||
/pkgs/pkgs-lib @infinisil
|
||||
## Format generators/serializers
|
||||
/pkgs/pkgs-lib/formats/libconfig @h7x4
|
||||
@@ -415,3 +415,8 @@ pkgs/by-name/lx/lxc* @adamcstephens
|
||||
/pkgs/by-name/in/installShellFiles/* @Ericson2314
|
||||
/pkgs/test/install-shell-files/* @Ericson2314
|
||||
/doc/hooks/installShellFiles.section.md @Ericson2314
|
||||
|
||||
# Darwin
|
||||
/pkgs/by-name/ap/apple-sdk @NixOS/darwin-core
|
||||
/pkgs/os-specific/darwin/apple-source-releases @NixOS/darwin-core
|
||||
/pkgs/stdenv/darwin @NixOS/darwin-core
|
||||
|
||||
@@ -21,7 +21,7 @@ In Nixpkgs, `cargo-tauri.hook` overrides the default build and install phases.
|
||||
npmHooks,
|
||||
openssl,
|
||||
pkg-config,
|
||||
webkitgtk,
|
||||
webkitgtk_4_0,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec {
|
||||
++ lib.optionals stdenv.isLinux [
|
||||
glib-networking # Most Tauri apps need networking
|
||||
libsoup
|
||||
webkitgtk
|
||||
webkitgtk_4_0
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
|
||||
@@ -760,7 +760,7 @@ that depend on that library, you may want to use:
|
||||
|
||||
```nix
|
||||
haskellPackages.haskell-ci.overrideScope (self: super: {
|
||||
Cabal = self.Cabal_3_6_2_0;
|
||||
Cabal = self.Cabal_3_14_0_0;
|
||||
})
|
||||
```
|
||||
|
||||
|
||||
@@ -678,7 +678,7 @@ Some projects, especially GNOME applications, are built with the Meson Build Sys
|
||||
, blueprint-compiler
|
||||
, libadwaita
|
||||
, libsecret
|
||||
, tracker
|
||||
, tinysparql
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -712,7 +712,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
libadwaita
|
||||
libsecret
|
||||
tracker
|
||||
tinysparql
|
||||
];
|
||||
|
||||
# ...
|
||||
|
||||
@@ -46,22 +46,198 @@ Some common issues when packaging software for Darwin:
|
||||
}
|
||||
```
|
||||
|
||||
- Some packages assume xcode is available and use `xcrun` to resolve build tools like `clang`, etc. This causes errors like `xcode-select: error: no developer tools were found at '/Applications/Xcode.app'` while the build doesn’t actually depend on xcode.
|
||||
- Some packages assume Xcode is available and use `xcrun` to resolve build tools like `clang`, etc. The Darwin stdenv includes `xcrun`, and it will return the path to any binary available in a build.
|
||||
|
||||
```nix
|
||||
stdenv.mkDerivation {
|
||||
name = "libfoo-1.2.3";
|
||||
# ...
|
||||
nativeBuildInputs = [ bison ];
|
||||
buildCommand = ''
|
||||
xcrun bison foo.y # produces foo.tab.c
|
||||
# ...
|
||||
'';
|
||||
}
|
||||
```
|
||||
The package `xcbuild` can be used to build projects that really depend on Xcode. However, this replacement is not 100% compatible with Xcode and can occasionally cause issues.
|
||||
|
||||
Note: Some packages may hardcode an absolute path to `xcrun`, `xcodebuild`, or `xcode-select`. Those paths should be removed or replaced.
|
||||
|
||||
```nix
|
||||
stdenv.mkDerivation {
|
||||
name = "libfoo-1.2.3";
|
||||
prePatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail '/usr/bin/xcrun clang' clang
|
||||
--replace-fail /usr/bin/xcrun xcrun
|
||||
# or: --replace-fail /usr/bin/xcrun '${lib.getExe' buildPackages.xcbuild "xcrun"}'
|
||||
'';
|
||||
}
|
||||
```
|
||||
|
||||
The package `xcbuild` can be used to build projects that really depend on Xcode. However, this replacement is not 100% compatible with Xcode and can occasionally cause issues.
|
||||
- Multiple SDKs are available for use in nixpkgs. Each platform has a default SDK (10.12.2 for x86_64-darwin and 11.3 for aarch64-darwin), which is available as the `apple-sdk` package.
|
||||
|
||||
- x86_64-darwin uses the 10.12 SDK by default, but some software is not compatible with that version of the SDK. In that case,
|
||||
the 11.0 SDK used by aarch64-darwin is available for use on x86_64-darwin. To use it, reference `apple_sdk_11_0` instead of
|
||||
`apple_sdk` in your derivation and use `pkgs.darwin.apple_sdk_11_0.callPackage` instead of `pkgs.callPackage`. On Linux, this will
|
||||
have the same effect as `pkgs.callPackage`, so you can use `pkgs.darwin.apple_sdk_11_0.callPackage` regardless of platform.
|
||||
The SDK provides the necessary headers and text-based stubs to link common frameworks and libraries (such as libSystem, which is effectively Darwin’s libc). Projects will sometimes indicate which SDK to use by the Xcode version. As a rule of thumb, subtract one from the Xcode version to get the available SDK in nixpkgs.
|
||||
|
||||
The `DEVELOPER_DIR` variable in the build environment has the path to the SDK in the build environment. The `SDKROOT` variable there contains a sysroot with the framework, header, and library paths. You can reference an SDK’s sysroot from Nix using the `sdkroot` attribute on the SDK package. Note that it is preferable to use `SDKROOT` because the latter will be resolved to the highest SDK version of any available to your derivation.
|
||||
|
||||
```nix
|
||||
stdenv.mkDerivation {
|
||||
name = "libfoo-1.2.3";
|
||||
# ...
|
||||
env.PACKAGE_SPECIFIC_SDK_VAR = apple-sdk_10_15.sdkroot;
|
||||
# or
|
||||
buildInputs = [ apple-sdk_10_15 ];
|
||||
postPatch = ''
|
||||
export PACKAGE_SPECIFIC_SDK_VAR=$SDKROOT
|
||||
'';
|
||||
}
|
||||
```
|
||||
|
||||
The following is a list of Xcode versions, the SDK version in nixpkgs, and the attribute to use to add it. 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).
|
||||
|
||||
| Xcode version | SDK version | nixpkgs attribute |
|
||||
|--------------------|---------------------------------------------------|-------------------|
|
||||
| Varies by platform | 10.12.2 (x86_64-darwin)<br/>11.3 (aarch64-darwin) | `apple-sdk` |
|
||||
| 8.0–8.3.3 | 10.12.2 | `apple-sdk_10_12` |
|
||||
| 9.0–9.4.1 | 10.13.2 | `apple-sdk_10_13` |
|
||||
| 10.0–10.3 | 10.14.6 | `apple-sdk_10_14` |
|
||||
| 11.0–11.7 | 10.15.6 | `apple-sdk_10_15` |
|
||||
| 12.0–12.5.1 | 11.3 | `apple-sdk_11` |
|
||||
| 13.0–13.4.1 | 12.3 | `apple-sdk_12` |
|
||||
| 14.0–14.3.1 | 13.3 | `apple-sdk_13` |
|
||||
| 15.0–15.4 | 14.4 | `apple-sdk_14` |
|
||||
| 16.0 | 15.0 | `apple-sdk_15` |
|
||||
|
||||
To use a non-default SDK, add it to your build inputs.
|
||||
|
||||
```nix
|
||||
stdenv.mkDerivation {
|
||||
name = "libfoo-1.2.3";
|
||||
# ...
|
||||
buildInputs = [ apple-sdk_15 ]; # Uses the 15.0 SDK instead of the default SDK for the platform.
|
||||
}
|
||||
```
|
||||
|
||||
If your derivation has multiple SDKs its inputs (e.g., because they have been propagated by its dependencies), it will use the highest SDK version available.
|
||||
|
||||
```nix
|
||||
stdenv.mkDerivation {
|
||||
name = "libfoo-1.2.3"; # Upstream specifies that it needs Xcode 12 to build, so use the 11.3 SDK.
|
||||
# ...
|
||||
buildInputs = [ apple-sdk_11 ];
|
||||
nativeBuildInputs = [ swift ]; # Propagates the 13.3 SDK, so the 13.3 SDK package will be used instead of the 11.3 SDK.
|
||||
}
|
||||
```
|
||||
|
||||
- When a package indicates a minimum supported version, also called the deployment target, you can set it in your derivation using `darwinMinVersionHook`. If you need to set a minimum version higher than the default SDK, you should also add the corresponding SDK to your `buildInputs`.
|
||||
|
||||
The deployment target controls how Darwin handles availability and access to some APIs. In most cases, if a deployment target is newer than the first availability of an API, that API will be linked directly. Otherwise, the API will be weakly linked and checked at runtime.
|
||||
|
||||
```nix
|
||||
stdenv.mkDerivation {
|
||||
name = "libfoo-1.2.3"; # Upstream specifies the minimum supported version as 12.5.
|
||||
buildInputs = [ (darwinMinVersionHook "12.5") ];
|
||||
}
|
||||
```
|
||||
|
||||
If your derivation has multiple versions of this hook in its inputs (e.g., because it has been propagated by one of your dependencies), it will use the highest deployment target available.
|
||||
|
||||
```nix
|
||||
stdenv.mkDerivation {
|
||||
name = "libfoo-1.2.3"; # Upstream specifies the minimum supported version as 10.15.
|
||||
buildInputs = [ qt6.qtbase (darwinMinVersionHook "10.15") ];
|
||||
}
|
||||
# Qt 6 specifies a minimum version of 12.0, so the minimum version resolves to 12.0.
|
||||
```
|
||||
|
||||
|
||||
- You should rely on the default SDK when possible. If a package specifies a required SDK version, use that version (e.g., libuv requires 11.0, so it should use `apple-sdk_11`). When a package supports multiple SDKs, determine which SDK package to use based on the following rules of thumb:
|
||||
|
||||
- If a package supports multiple SDK versions, use the lowest supported SDK version by the package (but no lower than the default SDK). That ensures maximal platform compatibility for the package.
|
||||
|
||||
- If a package specifies a range of supported SDK versions _and_ a minimum supported version, assume the package is using availability checks to support the indicated minimum version. Add the highest supported SDK and a `darwinMinVersionHook` set to the minimum version supported by the upstream package.
|
||||
|
||||
Warning: Avoid using newer SDKs than an upstream package supports. When a binary is linked on Darwin, the SDK version used to build it is recorded in the binary. Runtime behavior can vary based on the SDK version, which may work fine but can also result in unexpected behavior or crashes when building with an unsupported SDK.
|
||||
|
||||
```nix
|
||||
stdenv.mkDerivation {
|
||||
name = "foo-1.2.3";
|
||||
# ...
|
||||
buildInputs = [ apple-sdk_15 (darwinMinVersionHook "10.15") ]; # Upstream builds with the 15.0 SDK but supports 10.15.
|
||||
}
|
||||
```
|
||||
|
||||
- Libraries that require a minimum version can propagate an appropriate SDK and `darwinMinVersionHook`. Derivations using that library will automatically use an appropriate SDK and minimum version. Even if the library builds with a newer SDK, it should propagate the minimum supported SDK. Derivations that need a newer SDK can add it to their `buildInputs`.
|
||||
|
||||
```nix
|
||||
stdenv.mkDerivation {
|
||||
name = "libfoo-1.2.3";
|
||||
# ...
|
||||
buildInputs = [ apple-sdk_15 ]; # Upstream builds with the 15.0 SDK but supports 10.15.
|
||||
propagatedBuildInputs = [ apple-sdk_10_15 (darwinMinVersionHook "10.15") ];
|
||||
}
|
||||
# ...
|
||||
stdenv.mkDerivation {
|
||||
name = "bar-1.2.3";
|
||||
# ...
|
||||
buildInputs = [ libfoo ]; # Builds with the 10.15 SDK
|
||||
}
|
||||
# ...
|
||||
stdenv.mkDerivation {
|
||||
name = "baz-1.2.3";
|
||||
# ...
|
||||
buildInputs = [ apple-sdk_12 libfoo ]; # Builds with the 12.3 SDK
|
||||
}
|
||||
```
|
||||
|
||||
- Many SDK libraries and frameworks use text-based stubs to link against system libraries and frameworks, but several are built from source (typically corresponding to the source releases for the latest release of macOS). Several of these are propagated to your package automatically. They can be accessed via the `darwin` package set along with others that are not propagated by default.
|
||||
|
||||
- libiconv
|
||||
- libresolv
|
||||
- libsbuf
|
||||
|
||||
Other common libraries are available in Darwin-specific versions with modifications from Apple. Note that these packages may be made the default on Darwin in the future.
|
||||
|
||||
- ICU (compatible with the top-level icu package, but it also provides `libicucore.B.dylib` with an ABI compatible with the Darwin system version)
|
||||
- libpcap (compatible with the top-level libpcap, but it includes Darwin-specific extensions)
|
||||
|
||||
- The legacy SDKs packages are still available in the `darwin` package set under their existing names, but all packages in these SDKs (frameworks, libraries, etc) are stub packages for evaluation compatibility.
|
||||
|
||||
In most cases, a derivation can be updated by deleting all of its SDK inputs (frameworks, libraries, etc). If you had to override the SDK, see below for how to do that using the new SDK pattern. If your derivation depends on the layout of the old frameworks or other internal details, you have more work to do.
|
||||
|
||||
When a package depended on the location of frameworks, references to those framework packages can usually be replaced with `${apple-sdk.sdkroot}/System` or `$SDKROOT/System`. For example, if you substituted `${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework` in your derivation, you should replace it with `${apple-sdk.sdkroot}/System/Library/Frameworks/OpenGL.framework` or `$SDKROOT/System/Library/Frameworks`. The latter is preferred because it supports using the SDK that is resolved when multiple SDKs are propagated (see above).
|
||||
|
||||
Note: the new SDK pattern uses the name `apple-sdk` to better align with nixpkgs naming conventions. The old SDK pattern uses `apple_sdk`.
|
||||
|
||||
- There are two legacy patterns that are being phased out. These patterns were used in the past to change the SDK version. They have been reimplemented to use the `apple-sdk` packages.
|
||||
|
||||
- `pkgs.darwin.apple_sdk_11_0.callPackage` - this pattern was used to provide frameworks from the 11.0 SDK. It now adds the `apple-sdk_11` package to your derivation’s build inputs.
|
||||
- `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`. If `darwinMinVersion` is specified, it will add `darwinMinVersionHook` with the specified minimum version. No other SDK versions are supported.
|
||||
|
||||
- Darwin supports cross-compilation between Darwin platforms. Cross-compilation from Linux is not currently supported but may be supported in the future. To cross-compile to Darwin, you can set `crossSystem` or use one of the Darwin systems in `pkgsCross`. The `darwinMinVersionHook` and the SDKs support cross-compilation. If you need to specify a different SDK version for a `depsBuildBuild` compiler, add it to your `nativeBuildInputs`.
|
||||
|
||||
```nix
|
||||
stdenv.mkDerivation {
|
||||
name = "libfoo-1.2.3";
|
||||
# ...
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
nativeBuildInputs = [ apple-sdk_12 ];
|
||||
buildInputs = [ apple-sdk_13 ];
|
||||
depsTargetTargetPropagated = [ apple-sdk_14 ];
|
||||
}
|
||||
# The build-build clang will use the 12.3 SDK while the package build itself will use the 13.3 SDK.
|
||||
# Derivations that add this package as an input will have the 14.4 SDK propagated to them.
|
||||
```
|
||||
|
||||
The different target SDK and hooks are mangled based on role:
|
||||
|
||||
- `DEVELOPER_DIR_FOR_BUILD` and `MACOSX_DEPLOYMENT_TARGET_FOR_BUILD` for the build platform;
|
||||
- `DEVELOPER_DIR` and `MACOSX_DEPLOYMENT_TARGET` for the host platform; and
|
||||
- `DEVELOPER_DIR_FOR_TARGET` and `MACOSX_DEPLOYMENT_TARGET_FOR_TARGET` for the build platform.
|
||||
|
||||
In static compilation situations, it is possible for the build and host platform to be the same platform but have different SDKs with the same version (one dynamic and one static). cc-wrapper takes care of handling this distinction.
|
||||
|
||||
- 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. If you need to parameterize over a specific version, create a function that takes the version as a parameter instead of relying on these attributes.
|
||||
|
||||
- `darwinMinVersion` defaults to 10.12 on x86_64-darwin and 11.0 on aarch64-darwin. It sets the default `MACOSX_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.
|
||||
|
||||
@@ -194,9 +194,13 @@ with lib.maintainers;
|
||||
};
|
||||
|
||||
darwin = {
|
||||
members = [ toonn ];
|
||||
githubTeams = [ "darwin-maintainers" ];
|
||||
scope = "Maintain Darwin compatibility of packages and Darwin-only packages.";
|
||||
members = [
|
||||
emily
|
||||
reckenrode
|
||||
toonn
|
||||
];
|
||||
githubTeams = [ "darwin-core" ];
|
||||
scope = "Maintain core platform support and packages for macOS and other Apple platforms.";
|
||||
shortName = "Darwin";
|
||||
enableFeatureFreezePing = true;
|
||||
};
|
||||
|
||||
@@ -29,6 +29,8 @@
|
||||
|
||||
- PostgreSQL now defaults to major version 16.
|
||||
|
||||
- GNOME has been updated to version 47. Refer to the [release notes](https://release.gnome.org/47/) for more details.
|
||||
|
||||
- `authelia` has been upgraded to version 4.38. This version brings several features and improvements which are detailed in the [release blog post](https://www.authelia.com/blog/4.38-release-notes/).
|
||||
This release also deprecates some configuration keys, which are likely to be removed in future version 5.0, but they are still supported and expected to be working in the current version.
|
||||
|
||||
@@ -42,6 +44,8 @@
|
||||
Users can use it by `services.displayManager.ly.enable` and config it by
|
||||
`services.displayManager.ly.settings` to generate `/etc/ly/config.ini`
|
||||
|
||||
- `srcOnly` was rewritten to be more readable, have additional warnings in the event that something is probably wrong, use the `stdenv` provided by the derivation, and Noogle-compatible documentation was added.
|
||||
|
||||
- The default sound server for most graphical sessions has been switched from PulseAudio to PipeWire.
|
||||
Users that want to keep PulseAudio will want to set `services.pipewire.enable = false;` and `hardware.pulseaudio.enable = true;`.
|
||||
There is currently no plan to fully deprecate and remove PulseAudio, however, PipeWire should generally be preferred for new installs.
|
||||
@@ -231,7 +235,8 @@
|
||||
|
||||
- `grafana` has been updated to version 11.1. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected.
|
||||
|
||||
- `deno` has been updated to v2 which has breaking changes. Upstream will be abandoning v1 soon but for now you can use `deno_1` if you are yet to migrate (will be removed prior to cutting a final 24.11 release).
|
||||
- `deno` has been updated to Deno 2, which has breaking changes.
|
||||
See the [migration guide](https://docs.deno.com/runtime/reference/migration_guide/) for details.
|
||||
|
||||
- `gogs` has been removed. Upstream development has stalled and it has several
|
||||
[critical vulnerabilities](https://github.com/gogs/gogs/issues/7777) that weren't addressed
|
||||
@@ -304,6 +309,10 @@
|
||||
- The `mautrix-signal` module was adapted to incorporate the configuration rearrangement that resulted from the update to the mautrix bridgev2 architecture. Pre-0.7.0 configurations should continue to work.
|
||||
In case you want to update your configuration make sure to check the NixOS manual.
|
||||
|
||||
- The nvidia driver no longer defaults to the proprietary driver starting with version 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open driver.
|
||||
|
||||
- `postgresql` no longer accepts the `enableSystemd` override. Use `systemdSupport` instead.
|
||||
|
||||
- The dhcpcd service (`networking.useDHCP`) has been hardened and now runs exclusively as the "dhcpcd" user.
|
||||
Users that were relying on the root privileges in `networking.dhcpcd.runHook` will have to write specific [sudo](security.sudo.extraRules) or [polkit](security.polkit.extraConfig) rules to allow dhcpcd to perform privileged actions.
|
||||
|
||||
@@ -637,7 +646,7 @@
|
||||
- Minimal installer ISOs are no longer built on the small channel.
|
||||
Please obtain installer images from the full release channels.
|
||||
|
||||
- The default FFmpeg version is now 7, and FFmpeg 5 has been removed.
|
||||
- The default FFmpeg version is now 7.1, and FFmpeg 5 has been removed.
|
||||
Please prefer using the package variants without a version suffix,
|
||||
or pin FFmpeg 6 or 4 if necessary for compatibility.
|
||||
Note that we keep old versions around only as required
|
||||
|
||||
@@ -520,10 +520,10 @@
|
||||
./services/desktops/gnome/gnome-remote-desktop.nix
|
||||
./services/desktops/gnome/gnome-settings-daemon.nix
|
||||
./services/desktops/gnome/gnome-user-share.nix
|
||||
./services/desktops/gnome/localsearch.nix
|
||||
./services/desktops/gnome/rygel.nix
|
||||
./services/desktops/gnome/sushi.nix
|
||||
./services/desktops/gnome/tracker-miners.nix
|
||||
./services/desktops/gnome/tracker.nix
|
||||
./services/desktops/gnome/tinysparql.nix
|
||||
./services/desktops/gsignond.nix
|
||||
./services/desktops/gvfs.nix
|
||||
./services/desktops/malcontent.nix
|
||||
|
||||
@@ -253,8 +253,8 @@ in
|
||||
};
|
||||
in
|
||||
{ # These are mount related wrappers that require the +s permission.
|
||||
fusermount = mkSetuidRoot "${pkgs.fuse}/bin/fusermount";
|
||||
fusermount3 = mkSetuidRoot "${pkgs.fuse3}/bin/fusermount3";
|
||||
fusermount = mkSetuidRoot "${lib.getBin pkgs.fuse}/bin/fusermount";
|
||||
fusermount3 = mkSetuidRoot "${lib.getBin pkgs.fuse3}/bin/fusermount3";
|
||||
mount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/mount";
|
||||
umount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/umount";
|
||||
};
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
meta = {
|
||||
maintainers = lib.teams.gnome.members;
|
||||
};
|
||||
|
||||
imports = [
|
||||
(lib.mkRenamedOptionModule
|
||||
[
|
||||
"services"
|
||||
"gnome"
|
||||
"tracker-miners"
|
||||
"enable"
|
||||
]
|
||||
[
|
||||
"services"
|
||||
"gnome"
|
||||
"localsearch"
|
||||
"enable"
|
||||
]
|
||||
)
|
||||
];
|
||||
|
||||
options = {
|
||||
services.gnome.localsearch = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to enable LocalSearch, indexing services for TinySPARQL
|
||||
search engine and metadata storage system.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf config.services.gnome.localsearch.enable {
|
||||
environment.systemPackages = [ pkgs.localsearch ];
|
||||
|
||||
services.dbus.packages = [ pkgs.localsearch ];
|
||||
|
||||
systemd.packages = [ pkgs.localsearch ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.gnome.tinysparql;
|
||||
in
|
||||
{
|
||||
meta = {
|
||||
maintainers = lib.teams.gnome.members;
|
||||
};
|
||||
|
||||
imports = [
|
||||
(lib.mkRemovedOptionModule
|
||||
[
|
||||
"services"
|
||||
"gnome"
|
||||
"tracker"
|
||||
"subcommandPackages"
|
||||
]
|
||||
''
|
||||
This option is broken since 3.7 and since 3.8 tracker (tinysparql) no longer expect
|
||||
CLI to be extended by external projects, note that tracker-miners (localsearch) now
|
||||
provides its own CLI tool.
|
||||
''
|
||||
)
|
||||
(lib.mkRenamedOptionModule
|
||||
[
|
||||
"services"
|
||||
"gnome"
|
||||
"tracker"
|
||||
"enable"
|
||||
]
|
||||
[
|
||||
"services"
|
||||
"gnome"
|
||||
"tinysparql"
|
||||
"enable"
|
||||
]
|
||||
)
|
||||
];
|
||||
|
||||
options = {
|
||||
services.gnome.tinysparql = {
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to enable TinySPARQL services, a search engine,
|
||||
search tool and metadata storage system.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [ pkgs.tinysparql ];
|
||||
|
||||
services.dbus.packages = [ pkgs.tinysparql ];
|
||||
|
||||
systemd.packages = [ pkgs.tinysparql ];
|
||||
};
|
||||
}
|
||||
@@ -1,44 +0,0 @@
|
||||
# Tracker Miners daemons.
|
||||
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
|
||||
meta = {
|
||||
maintainers = lib.teams.gnome.members;
|
||||
};
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.gnome.tracker-miners = {
|
||||
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to enable Tracker miners, indexing services for Tracker
|
||||
search engine and metadata storage system.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
###### implementation
|
||||
|
||||
config = lib.mkIf config.services.gnome.tracker-miners.enable {
|
||||
|
||||
environment.systemPackages = [ pkgs.tracker-miners ];
|
||||
|
||||
services.dbus.packages = [ pkgs.tracker-miners ];
|
||||
|
||||
systemd.packages = [ pkgs.tracker-miners ];
|
||||
|
||||
services.gnome.tracker.subcommandPackages = [ pkgs.tracker-miners ];
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
@@ -1,66 +0,0 @@
|
||||
# Tracker daemon.
|
||||
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
cfg = config.services.gnome.tracker;
|
||||
in
|
||||
{
|
||||
|
||||
meta = {
|
||||
maintainers = lib.teams.gnome.members;
|
||||
};
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.gnome.tracker = {
|
||||
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to enable Tracker services, a search engine,
|
||||
search tool and metadata storage system.
|
||||
'';
|
||||
};
|
||||
|
||||
subcommandPackages = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.package;
|
||||
default = [ ];
|
||||
internal = true;
|
||||
description = ''
|
||||
List of packages containing tracker3 subcommands.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
environment.systemPackages = [ pkgs.tracker ];
|
||||
|
||||
services.dbus.packages = [ pkgs.tracker ];
|
||||
|
||||
systemd.packages = [ pkgs.tracker ];
|
||||
|
||||
environment.variables = {
|
||||
TRACKER_CLI_SUBCOMMANDS_DIR =
|
||||
let
|
||||
subcommandPackagesTree = pkgs.symlinkJoin {
|
||||
name = "tracker-with-subcommands-${pkgs.tracker.version}";
|
||||
paths = [ pkgs.tracker ] ++ cfg.subcommandPackages;
|
||||
};
|
||||
in
|
||||
"${subcommandPackagesTree}/libexec/tracker3";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
@@ -39,16 +39,16 @@ Note that this mechanism can only exclude core utilities, games and core develop
|
||||
|
||||
### Disabling GNOME services {#sec-gnome-disabling-services}
|
||||
|
||||
It is also possible to disable many of the [core services](https://github.com/NixOS/nixpkgs/blob/b8ec4fd2a4edc4e30d02ba7b1a2cc1358f3db1d5/nixos/modules/services/x11/desktop-managers/gnome.nix#L329-L348). For example, if you do not need indexing files, you can disable Tracker with:
|
||||
It is also possible to disable many of the [core services](https://github.com/NixOS/nixpkgs/blob/b8ec4fd2a4edc4e30d02ba7b1a2cc1358f3db1d5/nixos/modules/services/x11/desktop-managers/gnome.nix#L329-L348). For example, if you do not need indexing files, you can disable TinySPARQL with:
|
||||
|
||||
```nix
|
||||
{
|
||||
services.gnome.tracker-miners.enable = false;
|
||||
services.gnome.tracker.enable = false;
|
||||
services.gnome.localsearch.enable = false;
|
||||
services.gnome.tinysparql.enable = false;
|
||||
}
|
||||
```
|
||||
|
||||
Note, however, that doing so is not supported and might break some applications. Notably, GNOME Music cannot work without Tracker.
|
||||
Note, however, that doing so is not supported and might break some applications. Notably, GNOME Music cannot work without TinySPARQL.
|
||||
|
||||
### GNOME games {#sec-gnome-games}
|
||||
|
||||
|
||||
@@ -265,8 +265,8 @@ in
|
||||
services.gnome.evolution-data-server.enable = true;
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
services.gnome.gnome-online-accounts.enable = mkDefault true;
|
||||
services.gnome.tracker-miners.enable = mkDefault true;
|
||||
services.gnome.tracker.enable = mkDefault true;
|
||||
services.gnome.localsearch.enable = mkDefault true;
|
||||
services.gnome.tinysparql.enable = mkDefault true;
|
||||
services.hardware.bolt.enable = mkDefault true;
|
||||
# TODO: Enable once #177946 is resolved
|
||||
# services.packagekit.enable = mkDefault true;
|
||||
@@ -383,6 +383,7 @@ in
|
||||
pkgs.gnome-menus
|
||||
pkgs.gtk3.out # for gtk-launch program
|
||||
pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
|
||||
pkgs.xdg-user-dirs-gtk # Used to create the default bookmarks
|
||||
];
|
||||
in
|
||||
mandatoryPackages
|
||||
|
||||
@@ -405,7 +405,7 @@ let
|
||||
${lib.optionalString (config.boot.initrd.secrets == {})
|
||||
"exit 0"}
|
||||
|
||||
export PATH=${pkgs.coreutils}/bin:${pkgs.libarchive}/bin:${pkgs.gzip}/bin:${pkgs.findutils}/bin
|
||||
export PATH=${pkgs.coreutils}/bin:${pkgs.cpio}/bin:${pkgs.gzip}/bin:${pkgs.findutils}/bin
|
||||
|
||||
function cleanup {
|
||||
if [ -n "$tmp" -a -d "$tmp" ]; then
|
||||
@@ -426,7 +426,7 @@ let
|
||||
}
|
||||
|
||||
# mindepth 1 so that we don't change the mode of /
|
||||
(cd "$tmp" && find . -mindepth 1 | xargs touch -amt 197001010000 && find . -mindepth 1 -print0 | sort -z | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @-) | \
|
||||
(cd "$tmp" && find . -mindepth 1 | xargs touch -amt 197001010000 && find . -mindepth 1 -print0 | sort -z | cpio --quiet -o -H newc -R +0:+0 --reproducible --null) | \
|
||||
${compressorExe} ${lib.escapeShellArgs initialRamdisk.compressorArgs} >> "$1"
|
||||
'';
|
||||
|
||||
|
||||
@@ -20,12 +20,13 @@ with pkgs; {
|
||||
let
|
||||
sqlSU = "${nodes.master.services.postgresql.superUser}";
|
||||
pgProve = "${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}";
|
||||
inherit (nodes.master.services.postgresql.package.pkgs) pgjwt;
|
||||
in
|
||||
''
|
||||
start_all()
|
||||
master.wait_for_unit("postgresql")
|
||||
master.succeed(
|
||||
"${pkgs.gnused}/bin/sed -e '12 i SET search_path TO tap,public;' ${pgjwt.src}/test.sql > /tmp/test.sql"
|
||||
"${pkgs.gnused}/bin/sed -e '12 i CREATE EXTENSION pgcrypto;\\nCREATE EXTENSION pgtap;\\nSET search_path TO tap,public;' ${pgjwt.src}/test.sql > /tmp/test.sql"
|
||||
)
|
||||
master.succeed(
|
||||
"${pkgs.sudo}/bin/sudo -u ${sqlSU} PGOPTIONS=--search_path=tap,public ${pgProve}/bin/pg_prove -d postgres -v -f /tmp/test.sql"
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
, ninja
|
||||
, libmpdclient
|
||||
, yaml-cpp
|
||||
, darwin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -24,11 +23,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
nativeBuildInputs = [ cmake pkg-config meson ninja ];
|
||||
buildInputs = [ libmpdclient yaml-cpp ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ];
|
||||
buildInputs = [ libmpdclient yaml-cpp ];
|
||||
|
||||
mesonFlags = [ "-Dunsupported_use_system_yamlcpp=true" ];
|
||||
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
NIX_LDFLAGS = "-framework CoreFoundation";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/joshkunz/ashuffle";
|
||||
description = "Automatic library-wide shuffle for mpd";
|
||||
|
||||
Generated
+85
-132
@@ -49,6 +49,12 @@ version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
|
||||
|
||||
[[package]]
|
||||
name = "allocator-api2"
|
||||
version = "0.2.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
|
||||
|
||||
[[package]]
|
||||
name = "alsa"
|
||||
version = "0.9.1"
|
||||
@@ -250,7 +256,7 @@ dependencies = [
|
||||
"futures-lite 2.3.0",
|
||||
"parking",
|
||||
"polling 3.7.3",
|
||||
"rustix 0.38.35",
|
||||
"rustix 0.38.37",
|
||||
"slab",
|
||||
"tracing",
|
||||
"windows-sys 0.59.0",
|
||||
@@ -289,7 +295,7 @@ dependencies = [
|
||||
"cfg-if",
|
||||
"event-listener 3.1.0",
|
||||
"futures-lite 1.13.0",
|
||||
"rustix 0.38.35",
|
||||
"rustix 0.38.37",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
@@ -316,7 +322,7 @@ dependencies = [
|
||||
"cfg-if",
|
||||
"futures-core",
|
||||
"futures-io",
|
||||
"rustix 0.38.35",
|
||||
"rustix 0.38.37",
|
||||
"signal-hook-registry",
|
||||
"slab",
|
||||
"windows-sys 0.59.0",
|
||||
@@ -513,15 +519,6 @@ dependencies = [
|
||||
"generic-array",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "block2"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
|
||||
dependencies = [
|
||||
"objc2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "blocking"
|
||||
version = "1.6.1"
|
||||
@@ -1011,24 +1008,24 @@ dependencies = [
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs-next"
|
||||
version = "1.0.2"
|
||||
name = "directories"
|
||||
version = "5.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf36e65a80337bea855cd4ef9b8401ffce06a7baedf2e85ec467b1ac3f6e82b6"
|
||||
checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"dirs-sys-next",
|
||||
"dirs-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs-sys-next"
|
||||
version = "0.1.2"
|
||||
name = "dirs-sys"
|
||||
version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
|
||||
checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"option-ext",
|
||||
"redox_users",
|
||||
"winapi",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1365,6 +1362,12 @@ version = "1.0.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
||||
|
||||
[[package]]
|
||||
name = "foldhash"
|
||||
version = "0.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
|
||||
|
||||
[[package]]
|
||||
name = "foreign-types"
|
||||
version = "0.3.2"
|
||||
@@ -1389,12 +1392,6 @@ dependencies = [
|
||||
"percent-encoding",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fs_extra"
|
||||
version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
|
||||
|
||||
[[package]]
|
||||
name = "futf"
|
||||
version = "0.1.5"
|
||||
@@ -2033,6 +2030,17 @@ version = "0.14.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
|
||||
dependencies = [
|
||||
"allocator-api2",
|
||||
"equivalent",
|
||||
"foldhash",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
version = "0.3.3"
|
||||
@@ -2246,9 +2254,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "image"
|
||||
version = "0.25.2"
|
||||
version = "0.25.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
|
||||
checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"byteorder-lite",
|
||||
@@ -2269,9 +2277,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "image-webp"
|
||||
version = "0.1.3"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904"
|
||||
checksum = "e031e8e3d94711a9ccb5d6ea357439ef3dcbed361798bd4071dc4d9793fbe22f"
|
||||
dependencies = [
|
||||
"byteorder-lite",
|
||||
"quick-error",
|
||||
@@ -2290,7 +2298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
|
||||
dependencies = [
|
||||
"equivalent",
|
||||
"hashbrown",
|
||||
"hashbrown 0.14.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2573,12 +2581,6 @@ dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "linked-hash-map"
|
||||
version = "0.5.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.3.8"
|
||||
@@ -2617,12 +2619,12 @@ dependencies = [
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lru-cache"
|
||||
version = "0.1.2"
|
||||
name = "lru"
|
||||
version = "0.12.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
|
||||
checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
|
||||
dependencies = [
|
||||
"linked-hash-map",
|
||||
"hashbrown 0.15.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2936,6 +2938,15 @@ dependencies = [
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num_threads"
|
||||
version = "0.1.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "oauth2"
|
||||
version = "4.4.2"
|
||||
@@ -2965,40 +2976,6 @@ dependencies = [
|
||||
"malloc_buf",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "objc-sys"
|
||||
version = "0.3.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
|
||||
|
||||
[[package]]
|
||||
name = "objc2"
|
||||
version = "0.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
|
||||
dependencies = [
|
||||
"objc-sys",
|
||||
"objc2-encode",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "objc2-encode"
|
||||
version = "4.0.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8"
|
||||
|
||||
[[package]]
|
||||
name = "objc2-foundation"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
|
||||
dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
"block2",
|
||||
"libc",
|
||||
"objc2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "object"
|
||||
version = "0.36.4"
|
||||
@@ -3033,9 +3010,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.19.0"
|
||||
version = "1.20.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
|
||||
checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
|
||||
|
||||
[[package]]
|
||||
name = "open"
|
||||
@@ -3048,6 +3025,12 @@ dependencies = [
|
||||
"pathdiff",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "option-ext"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
|
||||
|
||||
[[package]]
|
||||
name = "ordered-stream"
|
||||
version = "0.2.0"
|
||||
@@ -3337,15 +3320,6 @@ version = "0.3.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
|
||||
|
||||
[[package]]
|
||||
name = "platform-dirs"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e188d043c1a692985f78b5464853a263f1a27e5bd6322bad3a4078ee3c998a38"
|
||||
dependencies = [
|
||||
"dirs-next",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "png"
|
||||
version = "0.17.13"
|
||||
@@ -3385,7 +3359,7 @@ dependencies = [
|
||||
"concurrent-queue",
|
||||
"hermit-abi 0.4.0",
|
||||
"pin-project-lite",
|
||||
"rustix 0.38.35",
|
||||
"rustix 0.38.37",
|
||||
"tracing",
|
||||
"windows-sys 0.59.0",
|
||||
]
|
||||
@@ -3510,7 +3484,6 @@ dependencies = [
|
||||
"aes",
|
||||
"audio_thread_priority",
|
||||
"byteorder",
|
||||
"chrono",
|
||||
"cpal",
|
||||
"crossbeam-channel",
|
||||
"ctr",
|
||||
@@ -3537,6 +3510,7 @@ dependencies = [
|
||||
"socks",
|
||||
"symphonia",
|
||||
"tempfile",
|
||||
"time",
|
||||
"ureq",
|
||||
"url",
|
||||
"windows 0.58.0",
|
||||
@@ -3547,19 +3521,18 @@ name = "psst-gui"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"crossbeam-channel",
|
||||
"directories",
|
||||
"druid",
|
||||
"druid-enums",
|
||||
"druid-shell",
|
||||
"env_logger",
|
||||
"fs_extra",
|
||||
"image 0.25.2",
|
||||
"image 0.25.4",
|
||||
"itertools 0.13.0",
|
||||
"log",
|
||||
"lru-cache",
|
||||
"lru",
|
||||
"once_cell",
|
||||
"open",
|
||||
"parking_lot",
|
||||
"platform-dirs",
|
||||
"psst-core",
|
||||
"rand",
|
||||
"raw-window-handle",
|
||||
@@ -3573,7 +3546,6 @@ dependencies = [
|
||||
"time-humanize",
|
||||
"ureq",
|
||||
"url",
|
||||
"webbrowser",
|
||||
"winres",
|
||||
]
|
||||
|
||||
@@ -3765,9 +3737,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.10.6"
|
||||
version = "1.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
|
||||
checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
@@ -3777,9 +3749,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex-automata"
|
||||
version = "0.4.7"
|
||||
version = "0.4.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
|
||||
checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
@@ -3788,9 +3760,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.8.4"
|
||||
version = "0.8.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
|
||||
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
|
||||
|
||||
[[package]]
|
||||
name = "reqwest"
|
||||
@@ -3838,9 +3810,6 @@ name = "rgb"
|
||||
version = "0.8.50"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ring"
|
||||
@@ -3894,9 +3863,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.38.35"
|
||||
version = "0.38.37"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f"
|
||||
checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
|
||||
dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
"errno",
|
||||
@@ -4034,18 +4003,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.209"
|
||||
version = "1.0.210"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
|
||||
checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.209"
|
||||
version = "1.0.210"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
|
||||
checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -4054,9 +4023,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.127"
|
||||
version = "1.0.132"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
|
||||
checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"memchr",
|
||||
@@ -4474,14 +4443,14 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
|
||||
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
version = "3.12.0"
|
||||
version = "3.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
|
||||
checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"fastrand 2.1.1",
|
||||
"once_cell",
|
||||
"rustix 0.38.35",
|
||||
"rustix 0.38.37",
|
||||
"windows-sys 0.59.0",
|
||||
]
|
||||
|
||||
@@ -4554,7 +4523,9 @@ checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
|
||||
dependencies = [
|
||||
"deranged",
|
||||
"itoa",
|
||||
"libc",
|
||||
"num-conv",
|
||||
"num_threads",
|
||||
"powerfmt",
|
||||
"serde",
|
||||
"time-core",
|
||||
@@ -5079,24 +5050,6 @@ dependencies = [
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "webbrowser"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e"
|
||||
dependencies = [
|
||||
"block2",
|
||||
"core-foundation",
|
||||
"home",
|
||||
"jni",
|
||||
"log",
|
||||
"ndk-context",
|
||||
"objc2",
|
||||
"objc2-foundation",
|
||||
"url",
|
||||
"web-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "webpki-roots"
|
||||
version = "0.25.4"
|
||||
|
||||
@@ -16,13 +16,13 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "psst";
|
||||
version = "unstable-2024-10-07";
|
||||
version = "unstable-2024-10-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpochyla";
|
||||
repo = pname;
|
||||
rev = "38d1c75d59848c54cb88896a93e05da3c71c7df4";
|
||||
hash = "sha256-iMtrZ1Mto3j4lFXI2Sm2R85+m8LpR7V1WoJ3X5JyF60=";
|
||||
rev = "02923198ba0e27b2b6271340cf57dd8ce109049b";
|
||||
hash = "sha256-gEK0yf37eREsI6kCIYTBlkkM6Fnjy0KGnd0XqcawGjU=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@@ -1,20 +1,22 @@
|
||||
diff --git a/psst-core/build.rs b/psst-core/build.rs
|
||||
deleted file mode 100644
|
||||
index cac2c23..0000000
|
||||
index 4e899af..0000000
|
||||
--- a/psst-core/build.rs
|
||||
+++ /dev/null
|
||||
@@ -1,41 +0,0 @@
|
||||
@@ -1,43 +0,0 @@
|
||||
-use gix_config::File;
|
||||
-use std::{env, fs, io::Write};
|
||||
-use time::OffsetDateTime;
|
||||
-
|
||||
-fn main() {
|
||||
- let outdir = env::var("OUT_DIR").unwrap();
|
||||
- let outfile = format!("{}/build-time.txt", outdir);
|
||||
-
|
||||
- let mut fh = fs::File::create(outfile).unwrap();
|
||||
- write!(fh, r#""{}""#, chrono::Local::now()).ok();
|
||||
- let now = OffsetDateTime::now_local().unwrap_or_else(|_| OffsetDateTime::now_utc());
|
||||
- write!(fh, r#""{}""#, now).ok();
|
||||
-
|
||||
- let git_config =
|
||||
- gix_config::File::from_git_dir("../.git/".into()).expect("Git Config not found!");
|
||||
- let git_config = File::from_git_dir("../.git/".into()).expect("Git Config not found!");
|
||||
- // Get Git's 'Origin' URL
|
||||
- let mut remote_url = git_config
|
||||
- .raw_value("remote.origin.url")
|
||||
@@ -46,7 +48,7 @@ index cac2c23..0000000
|
||||
- write!(file, r#""{}""#, remote_url).ok();
|
||||
-}
|
||||
diff --git a/psst-core/src/lib.rs b/psst-core/src/lib.rs
|
||||
index 2faa317..7d7501d 100644
|
||||
index 2faa317..b890a2d 100644
|
||||
--- a/psst-core/src/lib.rs
|
||||
+++ b/psst-core/src/lib.rs
|
||||
@@ -2,9 +2,9 @@
|
||||
@@ -56,7 +58,7 @@ index 2faa317..7d7501d 100644
|
||||
-pub const GIT_VERSION: &str = git_version!();
|
||||
-pub const BUILD_TIME: &str = include!(concat!(env!("OUT_DIR"), "/build-time.txt"));
|
||||
-pub const REMOTE_URL: &str = include!(concat!(env!("OUT_DIR"), "/remote-url.txt"));
|
||||
+pub const GIT_VERSION: &str = "38d1c75d59848c54cb88896a93e05da3c71c7df4";
|
||||
+pub const GIT_VERSION: &str = "02923198ba0e27b2b6271340cf57dd8ce109049b";
|
||||
+pub const BUILD_TIME: &str = "1970-01-01 00:00:00";
|
||||
+pub const REMOTE_URL: &str = "https://github.com/jpochyla/psst";
|
||||
|
||||
|
||||
@@ -20,6 +20,13 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
# ld64 on darwin doesn't support nested archives and as the nested lib
|
||||
# (libbase64.a) is not required to build so leave it out
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace share/Makefile.am \
|
||||
--replace-fail libpicture_a_LIBADD '#libpicture_a_LIBADD'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ libogg libvorbis libao curl speex flac ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
|
||||
|
||||
@@ -258,6 +258,10 @@ in
|
||||
|
||||
timerfunctions = ignoreCompilationErrorIfOlder super.timerfunctions "1.4.2.0.20201129.225252";
|
||||
|
||||
# kv is required in triples-test.el
|
||||
# Alternatively, we can delete that file. But adding a dependency is easier.
|
||||
triples = addPackageRequires super.triples [ self.kv ];
|
||||
|
||||
wisitoken-grammar-mode = ignoreCompilationError super.wisitoken-grammar-mode; # elisp error
|
||||
|
||||
xeft = super.xeft.overrideAttrs (old: {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -398,10 +398,10 @@
|
||||
elpaBuild {
|
||||
pname = "async";
|
||||
ename = "async";
|
||||
version = "1.9.8";
|
||||
version = "1.9.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/async-1.9.8.tar";
|
||||
sha256 = "0m9w7f8rgpcljsv2p6a9gwqx12whf66mbjranwwzacn98rwchh4v";
|
||||
url = "https://elpa.gnu.org/packages/async-1.9.9.tar";
|
||||
sha256 = "00slbyzjjn2v90lkaa9kc3wvlibs0rldh9crzjgp43y31xrzgpsg";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -419,10 +419,10 @@
|
||||
elpaBuild {
|
||||
pname = "auctex";
|
||||
ename = "auctex";
|
||||
version = "14.0.6";
|
||||
version = "14.0.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/auctex-14.0.6.tar";
|
||||
sha256 = "0cajri7x6770wjkrasa0p2s0dvcp74fpv1znac5wdfiwhvl1i9yr";
|
||||
url = "https://elpa.gnu.org/packages/auctex-14.0.7.tar";
|
||||
sha256 = "1m71jr853b4d713z1k4jj73c8ba4753hv8nighx62razgmpn4ci8";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -855,10 +855,10 @@
|
||||
elpaBuild {
|
||||
pname = "brief";
|
||||
ename = "brief";
|
||||
version = "5.91";
|
||||
version = "5.92";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/brief-5.91.tar";
|
||||
sha256 = "106xm23045l3ds5q04s7c6wa00ffv7rw495cjqp99nzqvvbmivcb";
|
||||
url = "https://elpa.gnu.org/packages/brief-5.92.tar";
|
||||
sha256 = "0nfnk5aag5w7170njdl9gq2kf48gzmbmdpz209y1vzdxw91jrwql";
|
||||
};
|
||||
packageRequires = [
|
||||
cl-lib
|
||||
@@ -1014,10 +1014,10 @@
|
||||
elpaBuild {
|
||||
pname = "cape";
|
||||
ename = "cape";
|
||||
version = "1.6";
|
||||
version = "1.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/cape-1.6.tar";
|
||||
sha256 = "1pqkdajl7nd510hxq4lph5cqj3j84mi01nl0ka2k4j8wrvb9zagn";
|
||||
url = "https://elpa.gnu.org/packages/cape-1.7.tar";
|
||||
sha256 = "03npj4a8g73dgrivjgc27w0c957naqhxq0hfzshdqci6mrq1gph3";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -1248,10 +1248,10 @@
|
||||
elpaBuild {
|
||||
pname = "comint-mime";
|
||||
ename = "comint-mime";
|
||||
version = "0.4";
|
||||
version = "0.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/comint-mime-0.4.tar";
|
||||
sha256 = "13vi973p0ahpvssv5m1pb63f2wkca0lz0nw3nsj6p4s3jzp46npa";
|
||||
url = "https://elpa.gnu.org/packages/comint-mime-0.6.tar";
|
||||
sha256 = "017d62n3n2jmsxb3r9jm4vk8vpapddbxfjjh8ww1vgcbzqr76zwy";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -1290,10 +1290,10 @@
|
||||
elpaBuild {
|
||||
pname = "company";
|
||||
ename = "company";
|
||||
version = "0.10.2";
|
||||
version = "1.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/company-0.10.2.tar";
|
||||
sha256 = "1708cqrcw26y8z7inm4nzbn2y8gkan5nv5bjzc4ry8zhqz94sxkz";
|
||||
url = "https://elpa.gnu.org/packages/company-1.0.2.tar";
|
||||
sha256 = "00vmqra0fav0w4q13ngwpyqpxqah0ahfg7kp5l2nd0h2l8sp79qr";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -1398,6 +1398,27 @@
|
||||
};
|
||||
}
|
||||
) { };
|
||||
constants = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "constants";
|
||||
ename = "constants";
|
||||
version = "2.11.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/constants-2.11.1.tar";
|
||||
sha256 = "0n1wa9hr0841733s6w30x1n5mmis8fpjfzl5mn7s9q12djpp20fy";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/constants.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
) { };
|
||||
consult = callPackage (
|
||||
{
|
||||
compat,
|
||||
@@ -1431,10 +1452,10 @@
|
||||
elpaBuild {
|
||||
pname = "consult-denote";
|
||||
ename = "consult-denote";
|
||||
version = "0.1.1";
|
||||
version = "0.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/consult-denote-0.1.1.tar";
|
||||
sha256 = "0yhf9fifas87rs4wdapszbpx1xqyq44izjq7vzpyvdlh5a5fhhx1";
|
||||
url = "https://elpa.gnu.org/packages/consult-denote-0.2.1.tar";
|
||||
sha256 = "15hih62a6lyfgw3ha86hppc9wp468gslrdcnx8kcz0dlkvp0k1kx";
|
||||
};
|
||||
packageRequires = [
|
||||
consult
|
||||
@@ -1448,6 +1469,7 @@
|
||||
) { };
|
||||
consult-hoogle = callPackage (
|
||||
{
|
||||
consult,
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
haskell-mode,
|
||||
@@ -1456,12 +1478,15 @@
|
||||
elpaBuild {
|
||||
pname = "consult-hoogle";
|
||||
ename = "consult-hoogle";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/consult-hoogle-0.2.1.tar";
|
||||
sha256 = "15am29sn0qx6yn8xcmdafzh1ijph10yd65cphcax02yx782hv6pr";
|
||||
url = "https://elpa.gnu.org/packages/consult-hoogle-0.2.2.tar";
|
||||
sha256 = "07z98nnxcaaws18by4id6c45yxlfwb9fk3p0gzll4ngym29zkd8c";
|
||||
};
|
||||
packageRequires = [ haskell-mode ];
|
||||
packageRequires = [
|
||||
consult
|
||||
haskell-mode
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/consult-hoogle.html";
|
||||
license = lib.licenses.free;
|
||||
@@ -1738,10 +1763,10 @@
|
||||
elpaBuild {
|
||||
pname = "cursory";
|
||||
ename = "cursory";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/cursory-1.0.1.tar";
|
||||
sha256 = "09ddn7rlmznq833nsm6s6zhzrq94lrbmm1vln43hax9yf784pqbr";
|
||||
url = "https://elpa.gnu.org/packages/cursory-1.1.0.tar";
|
||||
sha256 = "1n2d7nxg4m4i303vmsz0cxv9p5q6630y6x2g7mq51wbc7g0zdrhc";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -1781,10 +1806,10 @@
|
||||
elpaBuild {
|
||||
pname = "dape";
|
||||
ename = "dape";
|
||||
version = "0.14.0";
|
||||
version = "0.16.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/dape-0.14.0.tar";
|
||||
sha256 = "1aakk2v3nw1pl4ai9bb4h748z6bkfkilw283ndfah7jz61j90van";
|
||||
url = "https://elpa.gnu.org/packages/dape-0.16.0.tar";
|
||||
sha256 = "0zv2l2d91ywbi2v36kn7na94lm09zz5yyq50xdf5i44h9ridz7zw";
|
||||
};
|
||||
packageRequires = [ jsonrpc ];
|
||||
meta = {
|
||||
@@ -1868,10 +1893,10 @@
|
||||
elpaBuild {
|
||||
pname = "debbugs";
|
||||
ename = "debbugs";
|
||||
version = "0.40";
|
||||
version = "0.41";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/debbugs-0.40.tar";
|
||||
sha256 = "1agms2il38lgz02g4fswil9x5j1xwpl8kvhbd48jcx57nq18a7bl";
|
||||
url = "https://elpa.gnu.org/packages/debbugs-0.41.tar";
|
||||
sha256 = "0nchb7dnkrn34nh3bi0k5xmsn3da9m9v4iksh18045mfj6wn6bl5";
|
||||
};
|
||||
packageRequires = [ soap-client ];
|
||||
meta = {
|
||||
@@ -1915,10 +1940,10 @@
|
||||
elpaBuild {
|
||||
pname = "denote";
|
||||
ename = "denote";
|
||||
version = "3.0.8";
|
||||
version = "3.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/denote-3.0.8.tar";
|
||||
sha256 = "0hqv0lbjjs3df2vjwx3mnyj98kl3shh9aahl2y9mnmfq4fingdi8";
|
||||
url = "https://elpa.gnu.org/packages/denote-3.1.0.tar";
|
||||
sha256 = "03l9ya2n0nrj72dpnflxv19k8agzl3lab7hq0aqb7vzxafjfip74";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2177,10 +2202,10 @@
|
||||
elpaBuild {
|
||||
pname = "dired-preview";
|
||||
ename = "dired-preview";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/dired-preview-0.2.0.tar";
|
||||
sha256 = "15l01javijjjjc9bycljgshg9jv3clmfnsisy7f3caqxq78sb61l";
|
||||
url = "https://elpa.gnu.org/packages/dired-preview-0.3.0.tar";
|
||||
sha256 = "0cfwpdh70a7n37nkwqqnjfjb6nc8mfkcry3dl95xj2wj70bavsf8";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2485,10 +2510,10 @@
|
||||
elpaBuild {
|
||||
pname = "ediprolog";
|
||||
ename = "ediprolog";
|
||||
version = "2.2";
|
||||
version = "2.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ediprolog-2.2.tar";
|
||||
sha256 = "13g8y51lvdphi1v6rdca36c0r9v35lldx5979yrccsf07h0hw5gm";
|
||||
url = "https://elpa.gnu.org/packages/ediprolog-2.3.tar";
|
||||
sha256 = "02ynwqhkpv4wcz87zkr9188kjmhd8s9zkfiawn7gywb5jkki6nd0";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2506,10 +2531,10 @@
|
||||
elpaBuild {
|
||||
pname = "eev";
|
||||
ename = "eev";
|
||||
version = "20240811";
|
||||
version = "20241002";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/eev-20240811.tar";
|
||||
sha256 = "1m5d0jr408fc42kk5vdkdb2kk3x4k1q7k32hwbjb7fkmp8nkv7ll";
|
||||
url = "https://elpa.gnu.org/packages/eev-20241002.tar";
|
||||
sha256 = "0cl65zxryr6mlhbbpb9nbmabn8vnwc17vpqr7611s79jb9a7xsvf";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2527,10 +2552,10 @@
|
||||
elpaBuild {
|
||||
pname = "ef-themes";
|
||||
ename = "ef-themes";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ef-themes-1.7.0.tar";
|
||||
sha256 = "0d6rpwk1z9sc1yzfc4d4icb43pqwvdfvqap1m4r4aajvc5kasq1v";
|
||||
url = "https://elpa.gnu.org/packages/ef-themes-1.8.0.tar";
|
||||
sha256 = "0fv7m4cd4sdn8skx5li8g41kyjniwzfp8sn7jd9s4f7wzls5rnay";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2706,10 +2731,10 @@
|
||||
elpaBuild {
|
||||
pname = "ellama";
|
||||
ename = "ellama";
|
||||
version = "0.11.13";
|
||||
version = "0.11.14";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ellama-0.11.13.tar";
|
||||
sha256 = "1i5pn976a8y3b6927wq51cy9adjipn7xqlmdxy9gnhfnjsma2446";
|
||||
url = "https://elpa.gnu.org/packages/ellama-0.11.14.tar";
|
||||
sha256 = "1xd1pj02kgz83wsvygi5p7hlzx2898d38jmwq899qzpjn80jajb1";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -2809,10 +2834,10 @@
|
||||
elpaBuild {
|
||||
pname = "ement";
|
||||
ename = "ement";
|
||||
version = "0.15.1";
|
||||
version = "0.16";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ement-0.15.1.tar";
|
||||
sha256 = "1n1kxj5p6c6cnz6z54zayyb9lr6l54crfh5im2pbwpai1bk8lsld";
|
||||
url = "https://elpa.gnu.org/packages/ement-0.16.tar";
|
||||
sha256 = "1c496sm9lad5m18pjfwnqf6l1kjrnyayip8flj1ijm13996c3mp3";
|
||||
};
|
||||
packageRequires = [
|
||||
map
|
||||
@@ -3097,10 +3122,10 @@
|
||||
elpaBuild {
|
||||
pname = "exwm";
|
||||
ename = "exwm";
|
||||
version = "0.31";
|
||||
version = "0.32";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/exwm-0.31.tar";
|
||||
sha256 = "1i1k8w641n2fd6xifl92pvvq0s0b820lq76d1cyc7iyaqs44w9qq";
|
||||
url = "https://elpa.gnu.org/packages/exwm-0.32.tar";
|
||||
sha256 = "0k3c7grgkkpgd0r8b9vsqa5ywhb4vwxr3wfjyfxw8xy0yq7y0jvn";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -3317,10 +3342,10 @@
|
||||
elpaBuild {
|
||||
pname = "fontaine";
|
||||
ename = "fontaine";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/fontaine-2.0.0.tar";
|
||||
sha256 = "1h3hsqfx16ff0s776xvnafrlmj0m0r66hjra1mq2j55ahvh0aavk";
|
||||
url = "https://elpa.gnu.org/packages/fontaine-2.1.0.tar";
|
||||
sha256 = "10wywr7h4li99zxw3mzmy44rnkvii8rwri23b7vkacvhv3z8sfrf";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -3766,10 +3791,10 @@
|
||||
elpaBuild {
|
||||
pname = "greader";
|
||||
ename = "greader";
|
||||
version = "0.11.15";
|
||||
version = "0.11.18";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/greader-0.11.15.tar";
|
||||
sha256 = "0052gsjdqnlxgwd8l3h3x2zh2lzw76cwfdxvgxdk6x1g4cvhmjbx";
|
||||
url = "https://elpa.gnu.org/packages/greader-0.11.18.tar";
|
||||
sha256 = "122mvjcbvi7dzggx1dl02iw9jl0h33l8ka4mzvlr6sl0wwwzfpr8";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -4064,6 +4089,28 @@
|
||||
};
|
||||
}
|
||||
) { };
|
||||
indent-bars = callPackage (
|
||||
{
|
||||
compat,
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "indent-bars";
|
||||
ename = "indent-bars";
|
||||
version = "0.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/indent-bars-0.8.tar";
|
||||
sha256 = "0sy34xkghlwndyrismdrrsgnsz2901j8pdpfy8drbka6x4g6x36k";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/indent-bars.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
) { };
|
||||
inspector = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
@@ -4073,10 +4120,10 @@
|
||||
elpaBuild {
|
||||
pname = "inspector";
|
||||
ename = "inspector";
|
||||
version = "0.37";
|
||||
version = "0.38";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/inspector-0.37.tar";
|
||||
sha256 = "0825qd5ldx63li3vf89dsizn6w2gj87jn16yrfw0bxxn5jg255a0";
|
||||
url = "https://elpa.gnu.org/packages/inspector-0.38.tar";
|
||||
sha256 = "1b0hb8cd85p41kzalkkg698qx515gzrr85d6j7wn2b8h3rrpp3g4";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -4558,10 +4605,10 @@
|
||||
elpaBuild {
|
||||
pname = "kubed";
|
||||
ename = "kubed";
|
||||
version = "0.3.2";
|
||||
version = "0.4.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/kubed-0.3.2.tar";
|
||||
sha256 = "1adr74gdfvg9djd8hr457jgx2p08drc235l3p4ni76fnjngki1z2";
|
||||
url = "https://elpa.gnu.org/packages/kubed-0.4.1.tar";
|
||||
sha256 = "1p0r6jcwydh25ff613imr49yjw4hhy9wcxlzxrk3d2szipj4q8hs";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -4814,10 +4861,10 @@
|
||||
elpaBuild {
|
||||
pname = "llm";
|
||||
ename = "llm";
|
||||
version = "0.17.1";
|
||||
version = "0.17.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/llm-0.17.1.tar";
|
||||
sha256 = "15raqqychsag53q4pnlh6iwzb81z9zmi7nd0x5zkfpf4q71llsxc";
|
||||
url = "https://elpa.gnu.org/packages/llm-0.17.4.tar";
|
||||
sha256 = "01a4vnbffrh53q1j2if63a05j4859rzrrf7p3fisfbfj1cr2ywvw";
|
||||
};
|
||||
packageRequires = [ plz ];
|
||||
meta = {
|
||||
@@ -4940,10 +4987,10 @@
|
||||
elpaBuild {
|
||||
pname = "logos";
|
||||
ename = "logos";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/logos-1.1.1.tar";
|
||||
sha256 = "0dyy1y6225kbmsl5zy4hp0bdnnp06l05m8zqxc22alsivy2qvkjb";
|
||||
url = "https://elpa.gnu.org/packages/logos-1.2.0.tar";
|
||||
sha256 = "0a609jfgfwq71ksxw4h2q25qbix75yrf7vm0dfpyzjvgcmqiviab";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -5302,10 +5349,10 @@
|
||||
elpaBuild {
|
||||
pname = "modus-themes";
|
||||
ename = "modus-themes";
|
||||
version = "4.4.0";
|
||||
version = "4.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-4.4.0.tar";
|
||||
sha256 = "1bqvyf8xq55dligwqhw4d6z9bv529rhnijxv5y5gdlzap973bf71";
|
||||
url = "https://elpa.gnu.org/packages/modus-themes-4.5.0.tar";
|
||||
sha256 = "1f75rkl6bvqsc2s4fz67rk3h3fl9qw4vay0dj1agas4x0zskm89v";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -5706,10 +5753,10 @@
|
||||
elpaBuild {
|
||||
pname = "oauth2";
|
||||
ename = "oauth2";
|
||||
version = "0.16";
|
||||
version = "0.17";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/oauth2-0.16.tar";
|
||||
sha256 = "0bz4gqg5bhv6zk875q7sb0y56yvylnv0chj77ivjjpkha6rdp311";
|
||||
url = "https://elpa.gnu.org/packages/oauth2-0.17.tar";
|
||||
sha256 = "0ah0h3k6hiqm977414kyg96r6rrvnwvik3hz3ra3r0mxx7lksqha";
|
||||
};
|
||||
packageRequires = [
|
||||
cl-lib
|
||||
@@ -5851,6 +5898,7 @@
|
||||
) { };
|
||||
orderless = callPackage (
|
||||
{
|
||||
compat,
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
@@ -5858,12 +5906,12 @@
|
||||
elpaBuild {
|
||||
pname = "orderless";
|
||||
ename = "orderless";
|
||||
version = "1.1";
|
||||
version = "1.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/orderless-1.1.tar";
|
||||
sha256 = "1qjxln21ydc86kabk5kwa6ky40qjqcrk5nmc92w42x3ypxs711f3";
|
||||
url = "https://elpa.gnu.org/packages/orderless-1.2.tar";
|
||||
sha256 = "1iyfnvwqwn8y4bkv25zw15y8yy5dm89kyk7wlxw0al22bhfc2cm7";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/orderless.html";
|
||||
license = lib.licenses.free;
|
||||
@@ -5879,10 +5927,10 @@
|
||||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "9.7.10";
|
||||
version = "9.7.12";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-9.7.10.tar";
|
||||
sha256 = "0rabxq2diikdwifybril1b9cxkwry7agyw8gsdyf1n800f8vq5ka";
|
||||
url = "https://elpa.gnu.org/packages/org-9.7.12.tar";
|
||||
sha256 = "0v0mims57k5ffaf9i8szmrq3zvk3zd7xz7386k8lwc58mmhhdw15";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -6351,6 +6399,28 @@
|
||||
};
|
||||
}
|
||||
) { };
|
||||
phpinspect = callPackage (
|
||||
{
|
||||
compat,
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "phpinspect";
|
||||
ename = "phpinspect";
|
||||
version = "2.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/phpinspect-2.1.0.tar";
|
||||
sha256 = "1ic5dnp2sgahzpfxxgkfbk5as91l23vs1ly23b1igi3b4ajcaqjz";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/phpinspect.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
) { };
|
||||
phps-mode = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
@@ -6573,10 +6643,10 @@
|
||||
elpaBuild {
|
||||
pname = "posframe";
|
||||
ename = "posframe";
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/posframe-1.4.3.tar";
|
||||
sha256 = "1kw37dhyd6qxj0h2qpzi539jrgc0pj90psf2k58z4jc9199bgsax";
|
||||
url = "https://elpa.gnu.org/packages/posframe-1.4.4.tar";
|
||||
sha256 = "18cvfr2jxwsnsdg9f8wr0g64rkk6q1cc4gchrw76lnnknanidpk7";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -6723,10 +6793,10 @@
|
||||
elpaBuild {
|
||||
pname = "pulsar";
|
||||
ename = "pulsar";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/pulsar-1.0.1.tar";
|
||||
sha256 = "0xljxkls6lckfg5whx2kb44dp67q2jfs7cbk6ih5b3zm6h599d4k";
|
||||
url = "https://elpa.gnu.org/packages/pulsar-1.1.0.tar";
|
||||
sha256 = "0hs65y2avl8w5g4zd68sdg4rl4q15ac53xlbc4qrfjynlajma6mm";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -6766,16 +6836,17 @@
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
pyim,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "pyim-basedict";
|
||||
ename = "pyim-basedict";
|
||||
version = "0.5.4";
|
||||
version = "0.5.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/pyim-basedict-0.5.4.tar";
|
||||
sha256 = "0i42i9jr0p940w17fjjrzd258winjl7sv4g423ihd6057xmdpyd8";
|
||||
url = "https://elpa.gnu.org/packages/pyim-basedict-0.5.5.tar";
|
||||
sha256 = "04sfiywyrvilymg013gk81ya0ax6p24d4zyrjg8limjw0fn1b347";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
packageRequires = [ pyim ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/pyim-basedict.html";
|
||||
license = lib.licenses.free;
|
||||
@@ -6939,10 +7010,10 @@
|
||||
elpaBuild {
|
||||
pname = "rcirc-sqlite";
|
||||
ename = "rcirc-sqlite";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/rcirc-sqlite-1.0.2.tar";
|
||||
sha256 = "128wq3mm2ckcchly6c31i87jrkq19q7ysvx5fg34jhjg53dkrz28";
|
||||
url = "https://elpa.gnu.org/packages/rcirc-sqlite-1.0.3.tar";
|
||||
sha256 = "11m6n93qwfkn6jhn3vlvdz48wsqixlkbwbxsx3qdyj8jmjqpjvz6";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -7174,10 +7245,10 @@
|
||||
elpaBuild {
|
||||
pname = "rec-mode";
|
||||
ename = "rec-mode";
|
||||
version = "1.9.3";
|
||||
version = "1.9.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/rec-mode-1.9.3.tar";
|
||||
sha256 = "00hps4pi7r20qqqlfl8g5dqwipgyqqrhxc4hi5igl0rg563jc1wx";
|
||||
url = "https://elpa.gnu.org/packages/rec-mode-1.9.4.tar";
|
||||
sha256 = "0pi483g5qgz6gvyi13a4ldfbkaad3xkad08aqfcnmsdylvc9zzma";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -7554,6 +7625,27 @@
|
||||
};
|
||||
}
|
||||
) { };
|
||||
show-font = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "show-font";
|
||||
ename = "show-font";
|
||||
version = "0.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/show-font-0.1.1.tar";
|
||||
sha256 = "0l7l2kx5kq5p5kzigj0h3dwsf2hbcz8xlj06bz5m91gjblm3q6pd";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/show-font.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
) { };
|
||||
sisu-mode = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
@@ -8274,10 +8366,10 @@
|
||||
elpaBuild {
|
||||
pname = "taxy-magit-section";
|
||||
ename = "taxy-magit-section";
|
||||
version = "0.14";
|
||||
version = "0.14.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/taxy-magit-section-0.14.tar";
|
||||
sha256 = "13xwhqlvzfkm5gpprv683r8jri6wy54bhbzg3wiw3m020hqw6ygi";
|
||||
url = "https://elpa.gnu.org/packages/taxy-magit-section-0.14.3.tar";
|
||||
sha256 = "16j1a2vx9awr5vk1x3i1m526ym6836zxlypx1f50fcwjy0w8q8a3";
|
||||
};
|
||||
packageRequires = [
|
||||
magit-section
|
||||
@@ -8377,7 +8469,6 @@
|
||||
) { };
|
||||
tex-parens = callPackage (
|
||||
{
|
||||
auctex,
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
@@ -8385,12 +8476,12 @@
|
||||
elpaBuild {
|
||||
pname = "tex-parens";
|
||||
ename = "tex-parens";
|
||||
version = "0.4";
|
||||
version = "0.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tex-parens-0.4.tar";
|
||||
sha256 = "08mj18sh32z61kjizf3y6bb0zvb6qgdhrk9q7b15bi5mllk834zd";
|
||||
url = "https://elpa.gnu.org/packages/tex-parens-0.6.tar";
|
||||
sha256 = "0pgzs0fw2ijns2xqbyq7whlhjjrhp0axja0381q9v75c7fxrp6ba";
|
||||
};
|
||||
packageRequires = [ auctex ];
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/tex-parens.html";
|
||||
license = lib.licenses.free;
|
||||
@@ -8463,6 +8554,7 @@
|
||||
) { };
|
||||
tmr = callPackage (
|
||||
{
|
||||
compat,
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
@@ -8470,12 +8562,12 @@
|
||||
elpaBuild {
|
||||
pname = "tmr";
|
||||
ename = "tmr";
|
||||
version = "0.4.0";
|
||||
version = "1.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tmr-0.4.0.tar";
|
||||
sha256 = "0vvsanjs6b9m3gxm84qr0ywwdj0378y5jkv1nzqdn980rfgfimsv";
|
||||
url = "https://elpa.gnu.org/packages/tmr-1.0.0.tar";
|
||||
sha256 = "02dj5kh8ayhfy1w9vy77s7izz4495n4jkcbw6xscc8wyfml0j15f";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/tmr.html";
|
||||
license = lib.licenses.free;
|
||||
@@ -8559,10 +8651,10 @@
|
||||
elpaBuild {
|
||||
pname = "tramp";
|
||||
ename = "tramp";
|
||||
version = "2.7.1.1";
|
||||
version = "2.7.1.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.7.1.1.tar";
|
||||
sha256 = "1b14gwgfwx9n01mvbpi8q8lr9n4ik8lm580b8dvcaz456pm7bxb8";
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.7.1.3.tar";
|
||||
sha256 = "0ii16y283yidql05f69yx0x2jf71w8niq5k8mlrqq05z5h4h3sw3";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -8645,10 +8737,10 @@
|
||||
elpaBuild {
|
||||
pname = "transient";
|
||||
ename = "transient";
|
||||
version = "0.7.4";
|
||||
version = "0.7.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/transient-0.7.4.tar";
|
||||
sha256 = "00fcrbdk7gxaa25n5j1g688mlislnyj6w4743870liavvg982z9w";
|
||||
url = "https://elpa.gnu.org/packages/transient-0.7.7.tar";
|
||||
sha256 = "07c1n76nlchm5pp74hnx7bkwiibpal1ajdkmj559ja3099rgghkx";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -8739,10 +8831,10 @@
|
||||
elpaBuild {
|
||||
pname = "triples";
|
||||
ename = "triples";
|
||||
version = "0.3.5";
|
||||
version = "0.4.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/triples-0.3.5.tar";
|
||||
sha256 = "1wvmfw8yc7nh42f1skmpxqz5f57vkhg7x2cdngpq11lqbgvypj7m";
|
||||
url = "https://elpa.gnu.org/packages/triples-0.4.0.tar";
|
||||
sha256 = "0g29i33bmh9gh4mmk92h6vhhw42k1f2ph02qlrasn0w5fq3pg8vp";
|
||||
};
|
||||
packageRequires = [ seq ];
|
||||
meta = {
|
||||
@@ -8868,10 +8960,10 @@
|
||||
elpaBuild {
|
||||
pname = "urgrep";
|
||||
ename = "urgrep";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/urgrep-0.5.0.tar";
|
||||
sha256 = "14vga04hf03hj1ilcpl3qblmb7mhl9j0qwkq2whbc50p98avkhqi";
|
||||
url = "https://elpa.gnu.org/packages/urgrep-0.5.1.tar";
|
||||
sha256 = "1g0gcd3ayqjaj5yl95psh8qnjgaxd6l4r8gn4wlj5pnjnkz4llmv";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -8963,10 +9055,10 @@
|
||||
elpaBuild {
|
||||
pname = "use-package";
|
||||
ename = "use-package";
|
||||
version = "2.4.5";
|
||||
version = "2.4.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/use-package-2.4.5.tar";
|
||||
sha256 = "060bbrbmx3psv4jkn95zjyhbyfidip86sfi8975fhqcc0aagnwhp";
|
||||
url = "https://elpa.gnu.org/packages/use-package-2.4.6.tar";
|
||||
sha256 = "0idy78mpg9zikjqfg431q7fd34mwz18blvp6yq1bf29q582a9jyf";
|
||||
};
|
||||
packageRequires = [ bind-key ];
|
||||
meta = {
|
||||
@@ -9158,10 +9250,10 @@
|
||||
elpaBuild {
|
||||
pname = "verilog-mode";
|
||||
ename = "verilog-mode";
|
||||
version = "2024.3.1.121933719";
|
||||
version = "2024.10.9.140346409";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/verilog-mode-2024.3.1.121933719.tar";
|
||||
sha256 = "1z0mbd5sbbq2prhc0vfpqd4h4a6jwl5fqyrnl39yp05zm66va34w";
|
||||
url = "https://elpa.gnu.org/packages/verilog-mode-2024.10.9.140346409.tar";
|
||||
sha256 = "1hm0id8sivb7znvw1f63asbs4sf4v6hkimr0j8bqqda3h9sz197l";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -9613,10 +9705,10 @@
|
||||
elpaBuild {
|
||||
pname = "wrap-search";
|
||||
ename = "wrap-search";
|
||||
version = "4.16.19";
|
||||
version = "4.17.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/wrap-search-4.16.19.tar";
|
||||
sha256 = "1qrvn5cxvd5sl18hyn979f9kany5vnypbflkhzmxas5q0n2miyfw";
|
||||
url = "https://elpa.gnu.org/packages/wrap-search-4.17.6.tar";
|
||||
sha256 = "0wq0fw5ry5fnp96q9bffawc1vdl4p6kknwhlyf4xypmja011afys";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -9634,10 +9726,10 @@
|
||||
elpaBuild {
|
||||
pname = "xclip";
|
||||
ename = "xclip";
|
||||
version = "1.11";
|
||||
version = "1.11.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/xclip-1.11.tar";
|
||||
sha256 = "081k9azz9jnmjmqlcc1yw9s4nziac772lw75xcm78fgsfrx42hmr";
|
||||
url = "https://elpa.gnu.org/packages/xclip-1.11.1.tar";
|
||||
sha256 = "0raqlpskjrkxv7a0q5ikq8dqf2h21g0vcxdw03vqcah2v43zxflx";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
|
||||
@@ -15,10 +15,6 @@ lib.packagesFromDirectoryRecursive {
|
||||
inherit (pkgs) codeium;
|
||||
};
|
||||
|
||||
consult-gh = callPackage ./manual-packages/consult-gh {
|
||||
inherit (pkgs) gh;
|
||||
};
|
||||
|
||||
lsp-bridge = callPackage ./manual-packages/lsp-bridge {
|
||||
inherit (pkgs) basedpyright git go gopls python3;
|
||||
};
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
consult,
|
||||
embark-consult,
|
||||
fetchFromGitHub,
|
||||
forge,
|
||||
gh,
|
||||
markdown-mode,
|
||||
melpaBuild,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
melpaBuild {
|
||||
pname = "consult-gh";
|
||||
version = "1.0-unstable-2024-08-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "armindarvish";
|
||||
repo = "consult-gh";
|
||||
rev = "b1d85d179438e4b6469e1b78906a7dde8f07c822";
|
||||
hash = "sha256-VmxuXvO0nl0h9IKU+XWfjW90KG/1B+qHoOVhvYJ8XTs=";
|
||||
};
|
||||
|
||||
packageRequires = [
|
||||
consult
|
||||
embark-consult
|
||||
forge
|
||||
markdown-mode
|
||||
];
|
||||
|
||||
propagatedUserEnvPkgs = [ gh ];
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/armindarvish/consult-gh";
|
||||
description = "GitHub CLI client inside GNU Emacs using Consult";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
};
|
||||
}
|
||||
@@ -806,7 +806,11 @@ let
|
||||
boa-mode = ignoreCompilationError super.boa-mode; # elisp error
|
||||
|
||||
# missing optional dependencies
|
||||
boogie-friends = addPackageRequires super.boogie-friends [ self.lsp-mode ];
|
||||
# https://github.com/boogie-org/boogie-friends/issues/42
|
||||
boogie-friends = ignoreCompilationError (addPackageRequires super.boogie-friends [ self.lsp-mode ]);
|
||||
|
||||
# this package probably should not be compiled in nix build sandbox
|
||||
borg = ignoreCompilationError super.borg;
|
||||
|
||||
bpr = super.bpr.overrideAttrs (
|
||||
finalAttrs: previousAttrs: {
|
||||
@@ -930,6 +934,12 @@ let
|
||||
# missing optional dependencies
|
||||
conda = addPackageRequires super.conda [ self.projectile ];
|
||||
|
||||
consult-gh = super.consult-gh.overrideAttrs (old: {
|
||||
propagatedUserEnvPkgs = old.propagatedUserEnvPkgs or [ ] ++ [ pkgs.gh ];
|
||||
});
|
||||
|
||||
consult-gh-forge = buildWithGit super.consult-gh-forge;
|
||||
|
||||
counsel-gtags = ignoreCompilationError super.counsel-gtags; # elisp error
|
||||
|
||||
# https://github.com/fuxialexander/counsel-notmuch/issues/3
|
||||
@@ -1113,6 +1123,8 @@ let
|
||||
|
||||
gh-notify = buildWithGit super.gh-notify;
|
||||
|
||||
"git-gutter-fringe+" = ignoreCompilationError super."git-gutter-fringe+"; # elisp error
|
||||
|
||||
# https://github.com/nlamirault/emacs-gitlab/issues/68
|
||||
gitlab = addPackageRequires super.gitlab [ self.f ];
|
||||
|
||||
@@ -1228,6 +1240,23 @@ let
|
||||
# missing optional dependencies: vterm or eat
|
||||
julia-snail = addPackageRequires super.julia-snail [ self.eat ];
|
||||
|
||||
kanagawa-themes = super.kanagawa-themes.overrideAttrs (
|
||||
finalAttrs: previousAttrs: {
|
||||
patches =
|
||||
if lib.versionOlder finalAttrs.version "20241015.2237" then
|
||||
previousAttrs.patches or [ ]
|
||||
++ [
|
||||
(pkgs.fetchpatch {
|
||||
name = "fix-compilation-error.patch";
|
||||
url = "https://github.com/Fabiokleis/kanagawa-emacs/commit/83c2b5c292198b46a06ec0ad62619d83fd965433.patch";
|
||||
hash = "sha256-pB1ht03XCh+BWKHhxBAp701qt/KWAMJ2SQQaN3FgMjU=";
|
||||
})
|
||||
]
|
||||
else
|
||||
previousAttrs.patches or null;
|
||||
}
|
||||
);
|
||||
|
||||
kite = ignoreCompilationError super.kite; # elisp error
|
||||
|
||||
# missing optional dependencies
|
||||
|
||||
@@ -135,10 +135,10 @@
|
||||
elpaBuild {
|
||||
pname = "anzu";
|
||||
ename = "anzu";
|
||||
version = "0.64.0.20240201.224751";
|
||||
version = "0.66.0.20240928.212403";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/anzu-0.64.0.20240201.224751.tar";
|
||||
sha256 = "0gfhzb3064d8j4z91636imrh11202sy4905gc4j5rn2raylwwx73";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/anzu-0.66.0.20240928.212403.tar";
|
||||
sha256 = "1a96jbbg2miprbdj79l4q2k12r4wxklmbrrw3smfyrp5hisj71gc";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -177,10 +177,10 @@
|
||||
elpaBuild {
|
||||
pname = "apropospriate-theme";
|
||||
ename = "apropospriate-theme";
|
||||
version = "0.2.0.0.20240517.142324";
|
||||
version = "0.2.0.0.20240921.102210";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/apropospriate-theme-0.2.0.0.20240517.142324.tar";
|
||||
sha256 = "0pcgwz5qwl45h2c0mknw7h977v74lzpyyaxavnnm3hr8mfx1jlgm";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/apropospriate-theme-0.2.0.0.20240921.102210.tar";
|
||||
sha256 = "04x4s341lvygxxnjq3wjy8sp8p9y66kx3csklp46x33qyqbbdx82";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -284,10 +284,10 @@
|
||||
elpaBuild {
|
||||
pname = "bash-completion";
|
||||
ename = "bash-completion";
|
||||
version = "3.1.1.0.20230612.110320";
|
||||
version = "3.1.1.0.20240914.174817";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/bash-completion-3.1.1.0.20230612.110320.tar";
|
||||
sha256 = "1jw3cx6mzxv0mpk9xs1q3vll9sfyvw2mvvvpk9zirq2l13c31cjg";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/bash-completion-3.1.1.0.20240914.174817.tar";
|
||||
sha256 = "1s5wx8374naay0silh95vlci5qrxxz04av4f5iz94iwvi6jz0fa0";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -305,10 +305,10 @@
|
||||
elpaBuild {
|
||||
pname = "beancount";
|
||||
ename = "beancount";
|
||||
version = "0.9.0.20240801.232930";
|
||||
version = "0.9.0.20240908.163924";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/beancount-0.9.0.20240801.232930.tar";
|
||||
sha256 = "0mjf5nsp4zpck6nrqrbzk4xwkwglngs1nv8vdifdzgfdj1gxc8l0";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/beancount-0.9.0.20240908.163924.tar";
|
||||
sha256 = "0iqshz6xamnhx4m5phr5zrfmai61l41f44hmyiqvwqg6spyf6nzi";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -326,10 +326,10 @@
|
||||
elpaBuild {
|
||||
pname = "better-jumper";
|
||||
ename = "better-jumper";
|
||||
version = "1.0.1.0.20220111.101829";
|
||||
version = "1.0.1.0.20241009.111701";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/better-jumper-1.0.1.0.20220111.101829.tar";
|
||||
sha256 = "10wgfplj5sxr6lp0i9p5r0mvb2cf2xbpyfs6ky2kr4i5d9x29gaq";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/better-jumper-1.0.1.0.20241009.111701.tar";
|
||||
sha256 = "1ghi9g9bdai7i7fh9s5nldl9zfk3si9vjjn66qldb6q7v4g86gxx";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -453,10 +453,10 @@
|
||||
elpaBuild {
|
||||
pname = "buttercup";
|
||||
ename = "buttercup";
|
||||
version = "1.35.0.20240718.1456";
|
||||
version = "1.36.0.20240904.231112";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/buttercup-1.35.0.20240718.1456.tar";
|
||||
sha256 = "1f71i87mxd3z24mywwj3pdrdj4irg1k5bmrrlknbkm7i3427mm1z";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/buttercup-1.36.0.20240904.231112.tar";
|
||||
sha256 = "1kshwvzszv5jpjf3j5rpwas0zs60xprk0v30w58822vh13swcqrc";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -516,10 +516,10 @@
|
||||
elpaBuild {
|
||||
pname = "cdlatex";
|
||||
ename = "cdlatex";
|
||||
version = "4.18.4.0.20231118.64512";
|
||||
version = "4.18.5.0.20241007.162342";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/cdlatex-4.18.4.0.20231118.64512.tar";
|
||||
sha256 = "037lh3j49cv8yz0vwl441gg9s24im614gzjys6095mj794q47bq7";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/cdlatex-4.18.5.0.20241007.162342.tar";
|
||||
sha256 = "0zk8whr3644kab13p11rvbdrqlr2np6s0h329ggvw7bnsphg35yw";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -544,10 +544,10 @@
|
||||
elpaBuild {
|
||||
pname = "cider";
|
||||
ename = "cider";
|
||||
version = "1.15.1.0.20240815.91839";
|
||||
version = "1.16.0.0.20240925.134028";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/cider-1.15.1.0.20240815.91839.tar";
|
||||
sha256 = "0bp0f886gmka3ryb8yr8qspwl5rxnca38yn6fhrwnm5ga8j11d90";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/cider-1.16.0.0.20240925.134028.tar";
|
||||
sha256 = "1j874gyrdiy90f8hlxjkvxjdwzs8pixi19l28d009npj69mv0f6n";
|
||||
};
|
||||
packageRequires = [
|
||||
clojure-mode
|
||||
@@ -594,10 +594,10 @@
|
||||
elpaBuild {
|
||||
pname = "clojure-ts-mode";
|
||||
ename = "clojure-ts-mode";
|
||||
version = "0.2.2.0.20240725.113944";
|
||||
version = "0.2.2.0.20240930.131600";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.2.2.0.20240725.113944.tar";
|
||||
sha256 = "0v487r0inll37lp6rvd9ljyv5286xqpkcv28lbchbl71x2pm73ac";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.2.2.0.20240930.131600.tar";
|
||||
sha256 = "0qs76xj2fjhp42882ay1sg7ihzanzdh8mq4yffmqj1ljhkdyxsxc";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -638,10 +638,10 @@
|
||||
elpaBuild {
|
||||
pname = "consult-flycheck";
|
||||
ename = "consult-flycheck";
|
||||
version = "1.0.0.20240718.101150";
|
||||
version = "1.0.0.20240926.91748";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck-1.0.0.20240718.101150.tar";
|
||||
sha256 = "054mkwddsdyh3kkj0ky35gq38j2j4hxx98k5igx6awqsm1mpwgz1";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck-1.0.0.20240926.91748.tar";
|
||||
sha256 = "1f5869y8614hv91f3sc7i10wr3393mygz841crw4an4m03kxkq7f";
|
||||
};
|
||||
packageRequires = [
|
||||
consult
|
||||
@@ -795,10 +795,10 @@
|
||||
elpaBuild {
|
||||
pname = "dart-mode";
|
||||
ename = "dart-mode";
|
||||
version = "1.0.7.0.20240523.181912";
|
||||
version = "1.0.7.0.20240925.1934";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/dart-mode-1.0.7.0.20240523.181912.tar";
|
||||
sha256 = "1v2nxiin07g3kycids2f9ixgnc3gcm592xs6022ks9px5x3rnnv9";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/dart-mode-1.0.7.0.20240925.1934.tar";
|
||||
sha256 = "0pzhvlbfdk0adj4by21knbpvkj99dzclhixad2cdyfvqgw3j1xkk";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -850,6 +850,27 @@
|
||||
};
|
||||
}
|
||||
) { };
|
||||
devil = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "devil";
|
||||
ename = "devil";
|
||||
version = "0.7.0beta3.0.20240129.2809";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/devil-0.7.0beta3.0.20240129.2809.tar";
|
||||
sha256 = "1fhvp1kvvli5g9a3575bsa8zyfnf1q0p5wn15819zvncjp1912nl";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
homepage = "https://elpa.nongnu.org/nongnu-devel/devil.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
) { };
|
||||
diff-ansi = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
@@ -901,10 +922,10 @@
|
||||
elpaBuild {
|
||||
pname = "dockerfile-mode";
|
||||
ename = "dockerfile-mode";
|
||||
version = "1.7.0.20240324.61044";
|
||||
version = "1.7.0.20240914.114946";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/dockerfile-mode-1.7.0.20240324.61044.tar";
|
||||
sha256 = "0815zw60kjhsypriafi603vm3svp5x1bh5la0m9m9kw7dvgy04bj";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/dockerfile-mode-1.7.0.20240914.114946.tar";
|
||||
sha256 = "1v7yv221p844249m75ip41p0khn2gas7hfv8b0np3g78pzdai4mw";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -922,10 +943,10 @@
|
||||
elpaBuild {
|
||||
pname = "dracula-theme";
|
||||
ename = "dracula-theme";
|
||||
version = "1.8.2.0.20240614.130330";
|
||||
version = "1.8.2.0.20240912.203213";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/dracula-theme-1.8.2.0.20240614.130330.tar";
|
||||
sha256 = "04z1n3ay5n75bdz2fic9nzgjgsvvagl6620abi8gnznig85d60k7";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/dracula-theme-1.8.2.0.20240912.203213.tar";
|
||||
sha256 = "1wkyn7wswrgda7y267mxb6bi0h5ywp7hh2d4cmz3yfglnq1pmp1g";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -1071,10 +1092,10 @@
|
||||
elpaBuild {
|
||||
pname = "elpher";
|
||||
ename = "elpher";
|
||||
version = "3.6.2.0.20240702.81639";
|
||||
version = "3.6.3.0.20240930.91332";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/elpher-3.6.2.0.20240702.81639.tar";
|
||||
sha256 = "18b8g5z0w81704b84av6mcq2mf9mlj83qr18l2y7fv2qv16kwz85";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/elpher-3.6.3.0.20240930.91332.tar";
|
||||
sha256 = "1mf0d6gzykvpyjk2kxivlqs5xwxqdsxj9adfi92bna01dv5vrj3n";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -1092,10 +1113,10 @@
|
||||
elpaBuild {
|
||||
pname = "emacsql";
|
||||
ename = "emacsql";
|
||||
version = "4.0.1.0.20240819.155921";
|
||||
version = "4.0.3.0.20240906.134234";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/emacsql-4.0.1.0.20240819.155921.tar";
|
||||
sha256 = "0xm5b913ja85rw7h7fjhbzz288brsgd8xiq5wi7f8s8dwkbmqdv4";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/emacsql-4.0.3.0.20240906.134234.tar";
|
||||
sha256 = "0a9456snizy8w47vh8zj00180kncg0h3vv3iq86lckqhv2qbp0az";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -1132,18 +1153,20 @@
|
||||
fetchurl,
|
||||
goto-chg,
|
||||
lib,
|
||||
nadvice,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "evil";
|
||||
ename = "evil";
|
||||
version = "1.15.0.0.20240810.165559";
|
||||
version = "1.15.0.0.20241006.175409";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20240810.165559.tar";
|
||||
sha256 = "0a406n947j8blv7yrx691bjfgfqmkbpszxjdvwq5hda0mrc9g2kl";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20241006.175409.tar";
|
||||
sha256 = "0w752hhnpkfa5wqm1rk6nzq6n9y8c8mjzjhzri91l06jngpl6ckd";
|
||||
};
|
||||
packageRequires = [
|
||||
cl-lib
|
||||
goto-chg
|
||||
nadvice
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://elpa.nongnu.org/nongnu-devel/evil.html";
|
||||
@@ -1745,10 +1768,10 @@
|
||||
elpaBuild {
|
||||
pname = "geiser";
|
||||
ename = "geiser";
|
||||
version = "0.31.0.20240726.121756";
|
||||
version = "0.31.1.0.20240907.224131";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/geiser-0.31.0.20240726.121756.tar";
|
||||
sha256 = "19mfyvr13c95qpjrx7ngrraifiaqihpxkh7d6p5j0pda37hq5vav";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/geiser-0.31.1.0.20240907.224131.tar";
|
||||
sha256 = "1h8ifdccg72rfj1hgp8lshaklnql1vhgdi9i35057z76zwivsxn2";
|
||||
};
|
||||
packageRequires = [ project ];
|
||||
meta = {
|
||||
@@ -1878,10 +1901,10 @@
|
||||
elpaBuild {
|
||||
pname = "geiser-guile";
|
||||
ename = "geiser-guile";
|
||||
version = "0.28.2.0.20240811.112008";
|
||||
version = "0.28.3.0.20240920.3540";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/geiser-guile-0.28.2.0.20240811.112008.tar";
|
||||
sha256 = "144543qkxxycnailc8m7fhfqz4c8wphi9xc4b4p2cc009zn51xqs";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/geiser-guile-0.28.3.0.20240920.3540.tar";
|
||||
sha256 = "1ijrhz86nva194qsdch2zm9v4bzdppcg3vslnh03ss4f6qkcrfzz";
|
||||
};
|
||||
packageRequires = [
|
||||
geiser
|
||||
@@ -1925,10 +1948,10 @@
|
||||
elpaBuild {
|
||||
pname = "geiser-mit";
|
||||
ename = "geiser-mit";
|
||||
version = "0.15.0.20211204.193555";
|
||||
version = "0.15.0.20240909.114537";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/geiser-mit-0.15.0.20211204.193555.tar";
|
||||
sha256 = "146pvaj6y60vg57swna1nh9f7hjkkxq3033204vqyn0gbqy6psyw";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/geiser-mit-0.15.0.20240909.114537.tar";
|
||||
sha256 = "1a0j47f6qmn0p5zfv7gylgz8q9iax4xl6a7y9xq76cs2x6mi5883";
|
||||
};
|
||||
packageRequires = [ geiser ];
|
||||
meta = {
|
||||
@@ -1994,10 +2017,10 @@
|
||||
elpaBuild {
|
||||
pname = "git-commit";
|
||||
ename = "git-commit";
|
||||
version = "4.0.0.0.20240818.190757";
|
||||
version = "4.0.0.0.20240822.173501";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/git-commit-4.0.0.0.20240818.190757.tar";
|
||||
sha256 = "057xpp0w1hyb2c8h0sr4lnpyr5hphgb9yn27rq5jqhwkn8v9r8b2";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/git-commit-4.0.0.0.20240822.173501.tar";
|
||||
sha256 = "0k3bd17112xvgiykybb5sffk2vywz56zgm2h56bykhqq35sdcww8";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -2045,10 +2068,10 @@
|
||||
elpaBuild {
|
||||
pname = "gnosis";
|
||||
ename = "gnosis";
|
||||
version = "0.4.1.0.20240818.212703";
|
||||
version = "0.4.5.0.20241009.160730";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/gnosis-0.4.1.0.20240818.212703.tar";
|
||||
sha256 = "1nw13pfbgfja5c70zpmcrm6wqvps4zchskj26x1fh171233m8wln";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/gnosis-0.4.5.0.20241009.160730.tar";
|
||||
sha256 = "0kmmxhbmxi7l1ig01b2v36diidlz0192y8nxjr3znycx0qzdbn7x";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -2112,10 +2135,10 @@
|
||||
elpaBuild {
|
||||
pname = "gnuplot";
|
||||
ename = "gnuplot";
|
||||
version = "0.8.1.0.20230727.75810";
|
||||
version = "0.8.1.0.20240914.153054";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/gnuplot-0.8.1.0.20230727.75810.tar";
|
||||
sha256 = "16708cxz3jc0yw7wppdbqywy1k9drq9kqbk6j1sv1s7n1gc0xh00";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/gnuplot-0.8.1.0.20240914.153054.tar";
|
||||
sha256 = "0pv7ql14d7srb98nidw6fr4mwgssqyv95yskflz27dbbwjlycmn6";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2219,10 +2242,10 @@
|
||||
elpaBuild {
|
||||
pname = "gptel";
|
||||
ename = "gptel";
|
||||
version = "0.9.0.0.20240814.85808";
|
||||
version = "0.9.5.0.20241013.125757";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.0.0.20240814.85808.tar";
|
||||
sha256 = "0kpd0fypky0mwfb1lfyd3jbpr2lxispx02nqiz3a61zziljgdazd";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.5.0.20241013.125757.tar";
|
||||
sha256 = "123bvwfh6anp6arwznzinyckakpadagz6pn7381848k9zp5xz6lg";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -2243,10 +2266,10 @@
|
||||
elpaBuild {
|
||||
pname = "graphql-mode";
|
||||
ename = "graphql-mode";
|
||||
version = "1.0.0.0.20240328.173129";
|
||||
version = "1.0.0.0.20240918.121927";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/graphql-mode-1.0.0.0.20240328.173129.tar";
|
||||
sha256 = "1pwlmi35iyp397a3f7ipb5i1lx6v6qc03xz0l7nh4xlv0bkwxzk5";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/graphql-mode-1.0.0.0.20240918.121927.tar";
|
||||
sha256 = "198kbpazgczyb0qjclm8xgaha6wh6spr8ybvrbhm6nsf90zgv5kw";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2350,10 +2373,10 @@
|
||||
elpaBuild {
|
||||
pname = "haskell-mode";
|
||||
ename = "haskell-mode";
|
||||
version = "17.5.0.20240527.85346";
|
||||
version = "17.5.0.20241007.132004";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20240527.85346.tar";
|
||||
sha256 = "0wdanl6dh3j4z00mrqz3763gg8gjx9c3qsfd1mkz4as17dmqppjm";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20241007.132004.tar";
|
||||
sha256 = "1dj72kjy3jjxbfxxhj27yspc7n0059p7bxrv66hrzb0iginip45f";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2384,6 +2407,27 @@
|
||||
};
|
||||
}
|
||||
) { };
|
||||
haskell-ts-mode = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "haskell-ts-mode";
|
||||
ename = "haskell-ts-mode";
|
||||
version = "1.0.20240925.24042";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.0.20240925.24042.tar";
|
||||
sha256 = "1kkfg9b0cfa2ygxkp5da98sc0w2b8q2q99rcfdqm00i8l6lj5wm9";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
homepage = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
) { };
|
||||
helm = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
@@ -2395,10 +2439,10 @@
|
||||
elpaBuild {
|
||||
pname = "helm";
|
||||
ename = "helm";
|
||||
version = "3.9.9.0.20240818.123128";
|
||||
version = "4.0.0.20240929.41608";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/helm-3.9.9.0.20240818.123128.tar";
|
||||
sha256 = "01zj0bi9189nbpgp88sdpl61ly1xhqaf33cp8k41sfpka3v0g24f";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.0.20240929.41608.tar";
|
||||
sha256 = "1xf7nbnd2399cz2qkpvb0h38cdwx76jk9sq9wk67y6l23kvqh0sr";
|
||||
};
|
||||
packageRequires = [
|
||||
helm-core
|
||||
@@ -2420,10 +2464,10 @@
|
||||
elpaBuild {
|
||||
pname = "helm-core";
|
||||
ename = "helm-core";
|
||||
version = "3.9.9.0.20240818.123128";
|
||||
version = "4.0.0.20240929.41608";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/helm-core-3.9.9.0.20240818.123128.tar";
|
||||
sha256 = "185acikmdvzlwjnac7xkh5agzihka1h6r8ng3ma05gwdxkxnb28s";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.0.20240929.41608.tar";
|
||||
sha256 = "0lfk8hamfbaz0ifs4fkl836dqlcyw4g7kbsnmi5qjlyqc27yk8f9";
|
||||
};
|
||||
packageRequires = [ async ];
|
||||
meta = {
|
||||
@@ -2525,10 +2569,10 @@
|
||||
elpaBuild {
|
||||
pname = "htmlize";
|
||||
ename = "htmlize";
|
||||
version = "1.57.0.20240527.145632";
|
||||
version = "1.58.0.20240915.165713";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/htmlize-1.57.0.20240527.145632.tar";
|
||||
sha256 = "1wcx6hi2jiaac801hzhiix5ymhxmh8whwbjd5l9fbjfhxf0m0r9b";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/htmlize-1.58.0.20240915.165713.tar";
|
||||
sha256 = "1i2gp0m2qy7rknymn3ps1ss1vsbrx0zkxb6ya1ymc5vlqblqfwya";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2553,10 +2597,10 @@
|
||||
elpaBuild {
|
||||
pname = "hyperdrive";
|
||||
ename = "hyperdrive";
|
||||
version = "0.4pre0.20240818.142318";
|
||||
version = "0.5pre0.20241012.232703";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.4pre0.20240818.142318.tar";
|
||||
sha256 = "0ggsxw2s974l7m4v8p3f535fz13d0z15gwpx6pp7k3rrs5was9vp";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.5pre0.20241012.232703.tar";
|
||||
sha256 = "1wj52cs86jzl2cx9a3599fjncnra1x8as9md6i5afwmm9flb3yn6";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -2573,6 +2617,32 @@
|
||||
};
|
||||
}
|
||||
) { };
|
||||
hyperdrive-org-transclusion = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
hyperdrive,
|
||||
lib,
|
||||
org-transclusion,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "hyperdrive-org-transclusion";
|
||||
ename = "hyperdrive-org-transclusion";
|
||||
version = "0.3pre0.20240930.224512";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-org-transclusion-0.3pre0.20240930.224512.tar";
|
||||
sha256 = "13wacgy29zm9yly58hznj0k1liah9kqw2b6gkpk8804yrjzjhgd4";
|
||||
};
|
||||
packageRequires = [
|
||||
hyperdrive
|
||||
org-transclusion
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-org-transclusion.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
) { };
|
||||
idle-highlight-mode = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
@@ -2672,10 +2742,10 @@
|
||||
elpaBuild {
|
||||
pname = "inf-ruby";
|
||||
ename = "inf-ruby";
|
||||
version = "2.8.1.0.20240627.213541";
|
||||
version = "2.8.1.0.20240925.4944";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/inf-ruby-2.8.1.0.20240627.213541.tar";
|
||||
sha256 = "0yw67r2jwhrsxdzx1hnri6w8wxm5z76fxxbk333xf043gw5cg8ay";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/inf-ruby-2.8.1.0.20240925.4944.tar";
|
||||
sha256 = "1wl5nzrbafvmvvvq477lsvc14pvlmq8x9j1cqbd0cj11lvn4k1qb";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2740,10 +2810,10 @@
|
||||
elpaBuild {
|
||||
pname = "j-mode";
|
||||
ename = "j-mode";
|
||||
version = "2.0.1.0.20240611.171122";
|
||||
version = "2.0.1.0.20240920.120622";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/j-mode-2.0.1.0.20240611.171122.tar";
|
||||
sha256 = "1c4k74an4ib2zv19mjxxn9vl34w0ybyhmmgiv1l8jimqn5vi293h";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/j-mode-2.0.1.0.20240920.120622.tar";
|
||||
sha256 = "1v0qffz9qd943fmxny0ik5vrgrfskmf6rv9mgxp7xz6wz3v38ypd";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2803,10 +2873,10 @@
|
||||
elpaBuild {
|
||||
pname = "julia-mode";
|
||||
ename = "julia-mode";
|
||||
version = "0.4.0.20240506.120530";
|
||||
version = "1.0.0.0.20240926.152808";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/julia-mode-0.4.0.20240506.120530.tar";
|
||||
sha256 = "0kiwlc017bw8y2p166y2hpkpssml2rrx6p056qqn99ki5m682kav";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/julia-mode-1.0.0.0.20240926.152808.tar";
|
||||
sha256 = "0hhpzarz8xa61mp6drm0j98832h8sdammkp55ap6bj35vlyppc13";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2932,7 +3002,6 @@
|
||||
dash,
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
git-commit,
|
||||
lib,
|
||||
magit-section,
|
||||
seq,
|
||||
@@ -2942,15 +3011,14 @@
|
||||
elpaBuild {
|
||||
pname = "magit";
|
||||
ename = "magit";
|
||||
version = "4.0.0.0.20240817.175213";
|
||||
version = "4.1.1.0.20241001.205222";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/magit-4.0.0.0.20240817.175213.tar";
|
||||
sha256 = "1abp8d21dm8ygmmmx2bhq1wsz23w259l110743zyx77jbrynizci";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/magit-4.1.1.0.20241001.205222.tar";
|
||||
sha256 = "1qfaaqhm8m7cg4lrllv770w7bl2mfnpyx551accw757jxpnw8qdn";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
dash
|
||||
git-commit
|
||||
magit-section
|
||||
seq
|
||||
transient
|
||||
@@ -2974,10 +3042,10 @@
|
||||
elpaBuild {
|
||||
pname = "magit-section";
|
||||
ename = "magit-section";
|
||||
version = "4.0.0.0.20240818.190757";
|
||||
version = "4.1.1.0.20241001.205222";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.0.0.0.20240818.190757.tar";
|
||||
sha256 = "1bm8k9a8x06310099s71s11igh838fk4k26nb0gsd8xp1szima38";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.1.1.0.20241001.205222.tar";
|
||||
sha256 = "1lad3vqflf4fdsjfiyarjgcl7w73k8rj0bbsndc3xd6j5q53azfr";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -2990,6 +3058,27 @@
|
||||
};
|
||||
}
|
||||
) { };
|
||||
markdown-mode = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "markdown-mode";
|
||||
ename = "markdown-mode";
|
||||
version = "2.7alpha0.20240829.32430";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.7alpha0.20240829.32430.tar";
|
||||
sha256 = "0npgvcni0h5nr253fsn0d1cm3fnq1s662ba7aa23vsvkyk1x54d9";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
homepage = "https://elpa.nongnu.org/nongnu-devel/markdown-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
) { };
|
||||
mastodon = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
@@ -3001,10 +3090,10 @@
|
||||
elpaBuild {
|
||||
pname = "mastodon";
|
||||
ename = "mastodon";
|
||||
version = "1.0.26.0.20240816.70908";
|
||||
version = "1.0.27.0.20240920.183931";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.0.26.0.20240816.70908.tar";
|
||||
sha256 = "0nayg2py0n2m1ldpl1hwmiqv7yzvjxbbwndzxwipak0wvjzw0psl";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.0.27.0.20240920.183931.tar";
|
||||
sha256 = "0wy6ibdbj984aycscvsg24k4z3a0dlzi2ghbvrb8zq3lma8sy2a6";
|
||||
};
|
||||
packageRequires = [
|
||||
persist
|
||||
@@ -3076,10 +3165,10 @@
|
||||
elpaBuild {
|
||||
pname = "meow";
|
||||
ename = "meow";
|
||||
version = "1.4.5.0.20240818.154515";
|
||||
version = "1.4.5.0.20241014.63605";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/meow-1.4.5.0.20240818.154515.tar";
|
||||
sha256 = "0n716x8vyk44n4cw1rw68b747n2r3hvagx4asbhjck8mprnlw6z7";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/meow-1.4.5.0.20241014.63605.tar";
|
||||
sha256 = "1ws4i72gmr6g8fxvc27p28rm6wjdm71xpi03xiwy33x7m960g470";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -3139,10 +3228,10 @@
|
||||
elpaBuild {
|
||||
pname = "monokai-theme";
|
||||
ename = "monokai-theme";
|
||||
version = "3.5.3.0.20240710.102754";
|
||||
version = "3.5.3.0.20240911.104603";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/monokai-theme-3.5.3.0.20240710.102754.tar";
|
||||
sha256 = "0xncnb5fx7q55cl18gs6gw63di7p9kjyrfq7an5fig1rkmsyp4sx";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/monokai-theme-3.5.3.0.20240911.104603.tar";
|
||||
sha256 = "0721jwpyzvnqhzjldjdp98j585ivg02240jnxlnmry3428vc37av";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -3335,10 +3424,10 @@
|
||||
elpaBuild {
|
||||
pname = "org-contrib";
|
||||
ename = "org-contrib";
|
||||
version = "0.4.2.0.20240518.90129";
|
||||
version = "0.6.0.20240907.102556";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/org-contrib-0.4.2.0.20240518.90129.tar";
|
||||
sha256 = "0rkvdmff5fnjaziq14vwr4af0msq5lwzf4cyqrnyakh4dq7ffmpx";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/org-contrib-0.6.0.20240907.102556.tar";
|
||||
sha256 = "16dv65jz0ykzi0dk2zd1gj46113wq1bnzxzbacpbddix53vkfbc1";
|
||||
};
|
||||
packageRequires = [ org ];
|
||||
meta = {
|
||||
@@ -3406,10 +3495,10 @@
|
||||
elpaBuild {
|
||||
pname = "org-mime";
|
||||
ename = "org-mime";
|
||||
version = "0.3.3.0.20240818.24342";
|
||||
version = "0.3.4.0.20241001.42820";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/org-mime-0.3.3.0.20240818.24342.tar";
|
||||
sha256 = "0xg73swqd6dff1nh4z2jhhvj9ssq65wymq3jlbyb1nscm3g4lr83";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/org-mime-0.3.4.0.20241001.42820.tar";
|
||||
sha256 = "1xcdk15z18s073q3hlg7dck8p5ssgap35a6m0f6cbmd5dbd3r05f";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -3568,10 +3657,10 @@
|
||||
elpaBuild {
|
||||
pname = "package-lint";
|
||||
ename = "package-lint";
|
||||
version = "0.23.0.20240516.73305";
|
||||
version = "0.24.0.20241007.131950";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.23.0.20240516.73305.tar";
|
||||
sha256 = "1g1jinavkrlxnrpsjkfc8d9n9ag9y1svi0p8yqb4rswvjv0l6vll";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.24.0.20241007.131950.tar";
|
||||
sha256 = "1srjs8xwwiqzjh550snzk0yzd4vy3ynk0d3i41y2i7wgfdggyl0p";
|
||||
};
|
||||
packageRequires = [ let-alist ];
|
||||
meta = {
|
||||
@@ -3611,10 +3700,10 @@
|
||||
elpaBuild {
|
||||
pname = "page-break-lines";
|
||||
ename = "page-break-lines";
|
||||
version = "0.15.0.20240311.102621";
|
||||
version = "0.15.0.20240911.171451";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/page-break-lines-0.15.0.20240311.102621.tar";
|
||||
sha256 = "03bz8kr6mk7k9sfnai805kjfb7w4q45ba83k4vylwb8c1x5km32h";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/page-break-lines-0.15.0.20240911.171451.tar";
|
||||
sha256 = "142s6q9fyr030rkdj1i349nbsfab7r742h2i1x430g8m19qai4zr";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -3623,6 +3712,27 @@
|
||||
};
|
||||
}
|
||||
) { };
|
||||
paredit = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "paredit";
|
||||
ename = "paredit";
|
||||
version = "27beta0.20230718.202710";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/paredit-27beta0.20230718.202710.tar";
|
||||
sha256 = "0fz65pr6p6dz3i78rzprzznzhyw34w8msnd4mzkls63bm4548gmd";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
homepage = "https://elpa.nongnu.org/nongnu-devel/paredit.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
) { };
|
||||
parseclj = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
@@ -3747,10 +3857,10 @@
|
||||
elpaBuild {
|
||||
pname = "php-mode";
|
||||
ename = "php-mode";
|
||||
version = "1.25.1.0.20240722.164315";
|
||||
version = "1.26.1.0.20240912.223846";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.25.1.0.20240722.164315.tar";
|
||||
sha256 = "1fz4w8sbz59ylrag2kdv4wqjmvxj4dhi4q0bhslxa55vwgg2yfd6";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20240912.223846.tar";
|
||||
sha256 = "09jppnrpl6y1y41g7bshy674c3p39l8r060zq57kr2f022z93mg8";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -3810,10 +3920,10 @@
|
||||
elpaBuild {
|
||||
pname = "projectile";
|
||||
ename = "projectile";
|
||||
version = "2.9.0snapshot0.20240814.185449";
|
||||
version = "2.9.0snapshot0.20241009.115247";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.0snapshot0.20240814.185449.tar";
|
||||
sha256 = "059pjfr5gqmd7mrpxmkgasqaqcbhp8q0nj9dhrwqrlfm6g5xgg1q";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.0snapshot0.20241009.115247.tar";
|
||||
sha256 = "0lns0g1b52ib512dc0mqr8si6yqvnpcv148s262j5jqmm4a2sdm5";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -3831,10 +3941,10 @@
|
||||
elpaBuild {
|
||||
pname = "proof-general";
|
||||
ename = "proof-general";
|
||||
version = "4.6snapshot0.20240708.152546";
|
||||
version = "4.6snapshot0.20241004.113700";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20240708.152546.tar";
|
||||
sha256 = "1gc8g6gm0q7iirvgniv7fm3djlb651czr9iws0p41fvi4kq28b1r";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20241004.113700.tar";
|
||||
sha256 = "1kki60ds5mqkm89lfyx2ac510200bqfnmlkfcjkn7zcrkkcl6s7r";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -3874,10 +3984,10 @@
|
||||
elpaBuild {
|
||||
pname = "racket-mode";
|
||||
ename = "racket-mode";
|
||||
version = "1.0.20240813.124142";
|
||||
version = "1.0.20241001.105847";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20240813.124142.tar";
|
||||
sha256 = "0ypqv36wibcagkqpjwl3mwpqa4k59wns6kb1v55w2gywnk6qgv1y";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20241001.105847.tar";
|
||||
sha256 = "0yhvr3c6f2hsdj4i699h7z4gjjim359wk09z917lb8dqdd3ddjdv";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -3958,10 +4068,10 @@
|
||||
elpaBuild {
|
||||
pname = "reformatter";
|
||||
ename = "reformatter";
|
||||
version = "0.8.0.20240515.204925";
|
||||
version = "0.8.0.20241007.102705";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/reformatter-0.8.0.20240515.204925.tar";
|
||||
sha256 = "1iq4a99fxaaq2k0q9rfsprxx21sam8cpn455jddpcdcl71flbd72";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/reformatter-0.8.0.20241007.102705.tar";
|
||||
sha256 = "1z3zdmq78vziv45g133y1bnyzaszx0v16vdmwdfpcakj7b11qqw7";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -4042,10 +4152,10 @@
|
||||
elpaBuild {
|
||||
pname = "rust-mode";
|
||||
ename = "rust-mode";
|
||||
version = "1.0.5.0.20240520.74946";
|
||||
version = "1.0.6.0.20240919.160702";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/rust-mode-1.0.5.0.20240520.74946.tar";
|
||||
sha256 = "0k64mr7z18rf1w8fn83ajsbdghc9i8qf6lmc2wyckif8cwj3f9fa";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/rust-mode-1.0.6.0.20240919.160702.tar";
|
||||
sha256 = "10ack1z2zpfsn2li5nl6l7rpsm43hivgikjdqz5zgiskmqdfy1m5";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -4090,10 +4200,10 @@
|
||||
elpaBuild {
|
||||
pname = "scad-mode";
|
||||
ename = "scad-mode";
|
||||
version = "94.0.0.20240708.212011";
|
||||
version = "94.0.0.20240926.92457";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/scad-mode-94.0.0.20240708.212011.tar";
|
||||
sha256 = "01jyhpqqskizsclvxzii1kv20iklb8y01hglhhavrddf1dri7jza";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/scad-mode-94.0.0.20240926.92457.tar";
|
||||
sha256 = "09hgnzzfi6wdy3p0nfl6a00npxpsdy30dyc89m1h087wlhkjjyci";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -4217,10 +4327,10 @@
|
||||
elpaBuild {
|
||||
pname = "slime";
|
||||
ename = "slime";
|
||||
version = "2.30snapshot0.20240731.151818";
|
||||
version = "2.30snapshot0.20241013.100856";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/slime-2.30snapshot0.20240731.151818.tar";
|
||||
sha256 = "16xbiwqbp2zpppymxxwkbg1qmahih6dfb535dfa47b26j2wschhp";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/slime-2.30snapshot0.20241013.100856.tar";
|
||||
sha256 = "19i9vgb1h20lmfskr13b7jkj7xg16dkm0ymhndi41xbimdnvav42";
|
||||
};
|
||||
packageRequires = [ macrostep ];
|
||||
meta = {
|
||||
@@ -4301,10 +4411,10 @@
|
||||
elpaBuild {
|
||||
pname = "spacemacs-theme";
|
||||
ename = "spacemacs-theme";
|
||||
version = "0.2.0.20240815.213429";
|
||||
version = "0.2.0.20240825.170904";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20240815.213429.tar";
|
||||
sha256 = "1g7fzghy5nmz8v8vx5y6g3cwc2n9c1ryr09nrdfz3zlrv7r32df6";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20240825.170904.tar";
|
||||
sha256 = "196nby3c283qls06m6vgjr0g964jpyy760y1mmllkczbm4ia34aw";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -4322,10 +4432,10 @@
|
||||
elpaBuild {
|
||||
pname = "spell-fu";
|
||||
ename = "spell-fu";
|
||||
version = "0.3.0.20240616.234552";
|
||||
version = "0.3.0.20241011.20613";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/spell-fu-0.3.0.20240616.234552.tar";
|
||||
sha256 = "1dnyz5dm2p6nj8imqpmz23n2j368ygnff4z6f90vl6g52pv07d9r";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/spell-fu-0.3.0.20241011.20613.tar";
|
||||
sha256 = "1v9qzc7hqq0scs9vsgp88pp8hihxlsa8mcq5hmcz4g3p1ffhc1lb";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -4406,10 +4516,10 @@
|
||||
elpaBuild {
|
||||
pname = "subed";
|
||||
ename = "subed";
|
||||
version = "1.2.14.0.20240724.164835";
|
||||
version = "1.2.16.0.20241006.204608";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/subed-1.2.14.0.20240724.164835.tar";
|
||||
sha256 = "153rx77g6v6klyb4y3r322lbd7s1ympkya3sj04gvz3ka5d7znf3";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/subed-1.2.16.0.20241006.204608.tar";
|
||||
sha256 = "0xqqdjpkbf27yaixh60k79xnqpj8kppy9lc1z2ij73sp3lync0gb";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -4428,10 +4538,10 @@
|
||||
elpaBuild {
|
||||
pname = "sweeprolog";
|
||||
ename = "sweeprolog";
|
||||
version = "0.27.5.0.20240411.60241";
|
||||
version = "0.27.6.0.20240905.90947";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/sweeprolog-0.27.5.0.20240411.60241.tar";
|
||||
sha256 = "03diw4psd0chk3l6vd3fm1y99xby9b77nnd48jlxa06dgdx3jan9";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/sweeprolog-0.27.6.0.20240905.90947.tar";
|
||||
sha256 = "0wsl9dnz1vrr5qajcps5095gaxpqwspb16qac72sdafxidjfgabh";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -4450,10 +4560,10 @@
|
||||
elpaBuild {
|
||||
pname = "swift-mode";
|
||||
ename = "swift-mode";
|
||||
version = "9.1.0.0.20240622.93531";
|
||||
version = "9.2.0.0.20240921.44423";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/swift-mode-9.1.0.0.20240622.93531.tar";
|
||||
sha256 = "0b4x4p8iypmmqw0yn4c683rbvkn5n7nccr9pjnn89yx93d4pab0y";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/swift-mode-9.2.0.0.20240921.44423.tar";
|
||||
sha256 = "113gx8yrb5b75fca04k1335pfqwm5mhy5ns7wa9115wagdksfkj8";
|
||||
};
|
||||
packageRequires = [ seq ];
|
||||
meta = {
|
||||
@@ -4472,10 +4582,10 @@
|
||||
elpaBuild {
|
||||
pname = "symbol-overlay";
|
||||
ename = "symbol-overlay";
|
||||
version = "4.1.0.20240311.120733";
|
||||
version = "4.3.0.20240913.162400";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/symbol-overlay-4.1.0.20240311.120733.tar";
|
||||
sha256 = "0q4jj92l2xj5lj6hbxx42flrx4x923jidqmvkqq3japc2gvp8g00";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/symbol-overlay-4.3.0.20240913.162400.tar";
|
||||
sha256 = "0i5rs6cqfjl1c6m8wf0wwlzbsc7zvw9x0b8g8rds9n5c23b7gv15";
|
||||
};
|
||||
packageRequires = [ seq ];
|
||||
meta = {
|
||||
@@ -4882,10 +4992,10 @@
|
||||
elpaBuild {
|
||||
pname = "vm";
|
||||
ename = "vm";
|
||||
version = "8.3.0snapshot0.20240814.44941";
|
||||
version = "8.3.0snapshot0.20240917.131054";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20240814.44941.tar";
|
||||
sha256 = "1w5a0jm22xr6m1i2c5gghgy159dpqndkqhkyma3sagx5bmdsldrb";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20240917.131054.tar";
|
||||
sha256 = "0csg8ng38jqw5jlj5db24ngh5ay9qi8p8bvfgg3acxa26qjma03l";
|
||||
};
|
||||
packageRequires = [
|
||||
cl-lib
|
||||
@@ -4929,10 +5039,10 @@
|
||||
elpaBuild {
|
||||
pname = "webpaste";
|
||||
ename = "webpaste";
|
||||
version = "3.2.2.0.20240306.62647";
|
||||
version = "3.2.2.0.20241002.53654";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/webpaste-3.2.2.0.20240306.62647.tar";
|
||||
sha256 = "1iw744ncnfq8mhr5r1v09n14nvf26bhvja7fqwjsw5ainhfxzw6y";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/webpaste-3.2.2.0.20241002.53654.tar";
|
||||
sha256 = "0y63yrid0cxszfsm99pj6nig2siq85flma5l12fiydkpa6xh3ybj";
|
||||
};
|
||||
packageRequires = [
|
||||
cl-lib
|
||||
@@ -4953,10 +5063,10 @@
|
||||
elpaBuild {
|
||||
pname = "wfnames";
|
||||
ename = "wfnames";
|
||||
version = "1.2.0.20240418.100527";
|
||||
version = "1.2.0.20240822.162149";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/wfnames-1.2.0.20240418.100527.tar";
|
||||
sha256 = "112m3y96bdsk75vza4lh9lgdcnv35c3iqgidkgpynsgxil4njshj";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/wfnames-1.2.0.20240822.162149.tar";
|
||||
sha256 = "0wcnw48gpf0frx9fdhz4f4cxisb4v7dwbhd9q3i7j1ivdd07diwg";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -5017,10 +5127,10 @@
|
||||
elpaBuild {
|
||||
pname = "with-editor";
|
||||
ename = "with-editor";
|
||||
version = "3.4.1.0.20240816.195813";
|
||||
version = "3.4.2.0.20240831.223035";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.1.0.20240816.195813.tar";
|
||||
sha256 = "1z9c5ymia0g8mpx0nszrbw0yy23a7f91kyqxpvx544kbxh6k62dy";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.2.0.20240831.223035.tar";
|
||||
sha256 = "120v2n8py0qjcmlnf8l7p83w3bb5vg614ci65gliqhgmikhbwafh";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -5127,10 +5237,10 @@
|
||||
elpaBuild {
|
||||
pname = "xah-fly-keys";
|
||||
ename = "xah-fly-keys";
|
||||
version = "25.9.20240725161125.0.20240725.161208";
|
||||
version = "26.6.20241009212806.0.20241009.212859";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-25.9.20240725161125.0.20240725.161208.tar";
|
||||
sha256 = "06pvcbwj7b7h7nbv223yfjrxanf25s6rm3fq09zwmphwyy3ldlaw";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-26.6.20241009212806.0.20241009.212859.tar";
|
||||
sha256 = "07vpnsrifc6nkf7zrhahzgxn196wm3w71zvsvb249sjf3za9gz07";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -5191,10 +5301,10 @@
|
||||
elpaBuild {
|
||||
pname = "yaml-mode";
|
||||
ename = "yaml-mode";
|
||||
version = "0.0.16.0.20240317.160205";
|
||||
version = "0.0.16.0.20241003.15333";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/yaml-mode-0.0.16.0.20240317.160205.tar";
|
||||
sha256 = "08k4bygryrv0byczs6v06bm18m654fc070jjx85d3a2fxr9dh9a9";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/yaml-mode-0.0.16.0.20241003.15333.tar";
|
||||
sha256 = "1c6lid3iwxa911zk579rvy1dq8azq6xmp0s6lahchkcq40dvbjl5";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -5213,10 +5323,10 @@
|
||||
elpaBuild {
|
||||
pname = "yasnippet-snippets";
|
||||
ename = "yasnippet-snippets";
|
||||
version = "1.0.0.20240603.75736";
|
||||
version = "1.0.0.20240911.80118";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/yasnippet-snippets-1.0.0.20240603.75736.tar";
|
||||
sha256 = "0nw30a4ilgm65ic97vsvxjj6bw4p27mblrlymwnsg8hm7rnxmnwy";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/yasnippet-snippets-1.0.0.20240911.80118.tar";
|
||||
sha256 = "1wn5ckrlpacrlil6ap9j1x1lfr1yydnf0hcy268ji52hwvkdf55p";
|
||||
};
|
||||
packageRequires = [ yasnippet ];
|
||||
meta = {
|
||||
@@ -5234,10 +5344,10 @@
|
||||
elpaBuild {
|
||||
pname = "zenburn-theme";
|
||||
ename = "zenburn-theme";
|
||||
version = "2.9.0snapshot0.20240612.125832";
|
||||
version = "2.9.0snapshot0.20240926.61928";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/zenburn-theme-2.9.0snapshot0.20240612.125832.tar";
|
||||
sha256 = "1wgpb9x591z28gy7cm8i45qxl7srhj6sgcpnbzi303rbh90rd4sg";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/zenburn-theme-2.9.0snapshot0.20240926.61928.tar";
|
||||
sha256 = "029ip7ar11vif0c7qazsizp8600z7j0yznwl3j6wywpi6dzx4sii";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
|
||||
@@ -135,10 +135,10 @@
|
||||
elpaBuild {
|
||||
pname = "anzu";
|
||||
ename = "anzu";
|
||||
version = "0.64";
|
||||
version = "0.66";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/anzu-0.64.tar";
|
||||
sha256 = "0mv4xiy3481d5r4rypmw7nn1hjmsvlfz5dhgmpn6cqbpzkgb6zjb";
|
||||
url = "https://elpa.nongnu.org/nongnu/anzu-0.66.tar";
|
||||
sha256 = "17pyi02mydv59g5qwdzmf1rymkvvg52kx4b8n45pkwkhrwdmj2g3";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -453,10 +453,10 @@
|
||||
elpaBuild {
|
||||
pname = "buttercup";
|
||||
ename = "buttercup";
|
||||
version = "1.35";
|
||||
version = "1.36";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/buttercup-1.35.tar";
|
||||
sha256 = "0b9dxbn7pni2203xdg289ymkmhf458898i2lh7aplppmh68bms2c";
|
||||
url = "https://elpa.nongnu.org/nongnu/buttercup-1.36.tar";
|
||||
sha256 = "1glcsigj1s796xr9wps6a5mzrdl5qlfvmsnsa2yp5cwhkb9h1f50";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -516,10 +516,10 @@
|
||||
elpaBuild {
|
||||
pname = "cdlatex";
|
||||
ename = "cdlatex";
|
||||
version = "4.18.4";
|
||||
version = "4.18.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/cdlatex-4.18.4.tar";
|
||||
sha256 = "174i72z3pyxsbagqk7g8d84282fh3y3ipv0bcghrgqjznxdjx427";
|
||||
url = "https://elpa.nongnu.org/nongnu/cdlatex-4.18.5.tar";
|
||||
sha256 = "0d7ivpxkn7a4cam0cmgar9s0r943ni046dfn6z9k50zhzhaxcw6y";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -544,10 +544,10 @@
|
||||
elpaBuild {
|
||||
pname = "cider";
|
||||
ename = "cider";
|
||||
version = "1.15.1";
|
||||
version = "1.16.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/cider-1.15.1.tar";
|
||||
sha256 = "0qfh98hrlxpr71jqgsghmv687sp90iaffcgb7q5candcq8dscfb6";
|
||||
url = "https://elpa.nongnu.org/nongnu/cider-1.16.0.tar";
|
||||
sha256 = "1chp9ixd0k6yv4m727si6pgn2kys3zi5xkiq88xbv7bjcjryqmgz";
|
||||
};
|
||||
packageRequires = [
|
||||
clojure-mode
|
||||
@@ -1116,10 +1116,10 @@
|
||||
elpaBuild {
|
||||
pname = "elpher";
|
||||
ename = "elpher";
|
||||
version = "3.6.2";
|
||||
version = "3.6.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/elpher-3.6.2.tar";
|
||||
sha256 = "168cyhkp2q57k26r961c3g521qf8gj2b5rl8k1fg4z60y63s1rpk";
|
||||
url = "https://elpa.nongnu.org/nongnu/elpher-3.6.3.tar";
|
||||
sha256 = "0vjsb2jfgnf9jya14zigy2jcd8agxsncm7cxg61jm940jyvs8fsq";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -1137,10 +1137,10 @@
|
||||
elpaBuild {
|
||||
pname = "emacsql";
|
||||
ename = "emacsql";
|
||||
version = "4.0.1";
|
||||
version = "4.0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/emacsql-4.0.1.tar";
|
||||
sha256 = "0098ixlx70vx4mxlcyddkij9aj4sgcf7p699cii0pz51lg9bymc0";
|
||||
url = "https://elpa.nongnu.org/nongnu/emacsql-4.0.3.tar";
|
||||
sha256 = "1179z8d5mzhmnq2b1q9pf450jflxvrk5y2i3hzdl8lvd4nrm6kgw";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -1785,10 +1785,10 @@
|
||||
elpaBuild {
|
||||
pname = "geiser";
|
||||
ename = "geiser";
|
||||
version = "0.31";
|
||||
version = "0.31.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-0.31.tar";
|
||||
sha256 = "0szyasza76ak4qny9v9i3sk1m3mahlxcvvsk078q8rp9cms5lzkv";
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-0.31.1.tar";
|
||||
sha256 = "14d8syc51fkagc5isb8pym7mq5bw6ng83qxv1g5dnnj7nydl0gcr";
|
||||
};
|
||||
packageRequires = [ project ];
|
||||
meta = {
|
||||
@@ -1918,10 +1918,10 @@
|
||||
elpaBuild {
|
||||
pname = "geiser-guile";
|
||||
ename = "geiser-guile";
|
||||
version = "0.28.2";
|
||||
version = "0.28.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.2.tar";
|
||||
sha256 = "02s44dj6cr6fmiby6yljil7cgp00h31h3fs1a428lr3v51z1i38m";
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.3.tar";
|
||||
sha256 = "163p8ll68qdgpz6l1ixwcmffcsv1kas095davgwgq001hfx9db5x";
|
||||
};
|
||||
packageRequires = [
|
||||
geiser
|
||||
@@ -2085,10 +2085,10 @@
|
||||
elpaBuild {
|
||||
pname = "gnosis";
|
||||
ename = "gnosis";
|
||||
version = "0.4.1";
|
||||
version = "0.4.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/gnosis-0.4.1.tar";
|
||||
sha256 = "1iqpssf3gxv54gig718529y3cfjybvvjcvndzhjsiyw5b33pkbby";
|
||||
url = "https://elpa.nongnu.org/nongnu/gnosis-0.4.5.tar";
|
||||
sha256 = "00rca3rfij2c8120kzs8wc6xsarpcj20gzwys05c7fhf7j8l5bdy";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -2259,10 +2259,10 @@
|
||||
elpaBuild {
|
||||
pname = "gptel";
|
||||
ename = "gptel";
|
||||
version = "0.9.0";
|
||||
version = "0.9.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/gptel-0.9.0.tar";
|
||||
sha256 = "1crcng1h6i64h6l3pha96k3hy2hga73pp0wy4i9gdrc1ra0dbjf4";
|
||||
url = "https://elpa.nongnu.org/nongnu/gptel-0.9.5.tar";
|
||||
sha256 = "0ixji76xaqkm0ziidjmanax4q0xqyj1qcwva6r5sbsks6gpmrziv";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -2423,6 +2423,27 @@
|
||||
};
|
||||
}
|
||||
) { };
|
||||
haskell-ts-mode = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "haskell-ts-mode";
|
||||
ename = "haskell-ts-mode";
|
||||
version = "1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/haskell-ts-mode-1.tar";
|
||||
sha256 = "16x2dr64f6s8837pl7dn7my3xpfc0x11p556r1ds5hwg0c82ikh4";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
homepage = "https://elpa.nongnu.org/nongnu/haskell-ts-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
) { };
|
||||
helm = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
@@ -2434,10 +2455,10 @@
|
||||
elpaBuild {
|
||||
pname = "helm";
|
||||
ename = "helm";
|
||||
version = "3.9.9";
|
||||
version = "4.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-3.9.9.tar";
|
||||
sha256 = "1k3jq2miivj881h0mpl68zgd229kj50axynsgxizdddg56nfsdm0";
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-4.0.tar";
|
||||
sha256 = "1nvdadphkqizrpd92wp9n8dhbqp7dh7m4vhpxf9m18hqwrwsbm0v";
|
||||
};
|
||||
packageRequires = [
|
||||
helm-core
|
||||
@@ -2459,10 +2480,10 @@
|
||||
elpaBuild {
|
||||
pname = "helm-core";
|
||||
ename = "helm-core";
|
||||
version = "3.9.9";
|
||||
version = "4.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.9.tar";
|
||||
sha256 = "067x4g19w032671545bfah4262xyhgnwxkaw8pdk4fqd5znw0yck";
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-core-4.0.tar";
|
||||
sha256 = "043pavv01m7frhdvfnp3f1xfbs1xjv43p1xs96yg75gyg1cigfd5";
|
||||
};
|
||||
packageRequires = [ async ];
|
||||
meta = {
|
||||
@@ -2564,10 +2585,10 @@
|
||||
elpaBuild {
|
||||
pname = "htmlize";
|
||||
ename = "htmlize";
|
||||
version = "1.56";
|
||||
version = "1.58";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/htmlize-1.56.tar";
|
||||
sha256 = "0s4k5q8b4grx3zyrryxcqahixkpzcni2qqnmm07axfxpgcqcnk9c";
|
||||
url = "https://elpa.nongnu.org/nongnu/htmlize-1.58.tar";
|
||||
sha256 = "1vd7pq8rrxnc5x2nc6qjjkh3hyk89m7g8zdijpw463d4v6wrrfpx";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2583,6 +2604,7 @@
|
||||
fetchurl,
|
||||
lib,
|
||||
map,
|
||||
org,
|
||||
persist,
|
||||
plz,
|
||||
taxy-magit-section,
|
||||
@@ -2591,14 +2613,15 @@
|
||||
elpaBuild {
|
||||
pname = "hyperdrive";
|
||||
ename = "hyperdrive";
|
||||
version = "0.3";
|
||||
version = "0.4.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/hyperdrive-0.3.tar";
|
||||
sha256 = "03r5qx3a0w1ll4ql7nrjgp19cnk7rrf7ibvj8gd57gqqihkdmqqw";
|
||||
url = "https://elpa.nongnu.org/nongnu/hyperdrive-0.4.2.tar";
|
||||
sha256 = "19cgx0x54xj2z98m8mr1xmz0bbja0nilh8n47mkbnzmcqidv75gq";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
map
|
||||
org
|
||||
persist
|
||||
plz
|
||||
taxy-magit-section
|
||||
@@ -2610,6 +2633,32 @@
|
||||
};
|
||||
}
|
||||
) { };
|
||||
hyperdrive-org-transclusion = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
hyperdrive,
|
||||
lib,
|
||||
org-transclusion,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "hyperdrive-org-transclusion";
|
||||
ename = "hyperdrive-org-transclusion";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/hyperdrive-org-transclusion-0.2.tar";
|
||||
sha256 = "1zbhbsfrdcc5mfkpbzwkyn9bgapf8hs0jzy14lv9d5g99wskzbis";
|
||||
};
|
||||
packageRequires = [
|
||||
hyperdrive
|
||||
org-transclusion
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://elpa.nongnu.org/nongnu/hyperdrive-org-transclusion.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
) { };
|
||||
idle-highlight-mode = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
@@ -2840,10 +2889,10 @@
|
||||
elpaBuild {
|
||||
pname = "julia-mode";
|
||||
ename = "julia-mode";
|
||||
version = "0.4";
|
||||
version = "1.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/julia-mode-0.4.tar";
|
||||
sha256 = "15x63nwq6rh1yxwwd8hf0a8nznws8gzxqiw45n6pv8vp8h2v3fsi";
|
||||
url = "https://elpa.nongnu.org/nongnu/julia-mode-1.0.0.tar";
|
||||
sha256 = "02xab8qhf1z4cdn847n9ar2g65843qknca88jkaa94zzkxpv2bi1";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2969,7 +3018,6 @@
|
||||
dash,
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
git-commit,
|
||||
lib,
|
||||
magit-section,
|
||||
seq,
|
||||
@@ -2979,15 +3027,14 @@
|
||||
elpaBuild {
|
||||
pname = "magit";
|
||||
ename = "magit";
|
||||
version = "4.0.0";
|
||||
version = "4.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/magit-4.0.0.tar";
|
||||
sha256 = "0sii8gr69j29fzvcdyabnabldkvi6r5dpiamfs3bsmh66vf8wvjh";
|
||||
url = "https://elpa.nongnu.org/nongnu/magit-4.1.1.tar";
|
||||
sha256 = "0rjxlrs5ik6mqnvs9mz2pjmz23np3ch0ybkzimd9ji70283fyif6";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
dash
|
||||
git-commit
|
||||
magit-section
|
||||
seq
|
||||
transient
|
||||
@@ -3011,10 +3058,10 @@
|
||||
elpaBuild {
|
||||
pname = "magit-section";
|
||||
ename = "magit-section";
|
||||
version = "4.0.0";
|
||||
version = "4.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/magit-section-4.0.0.tar";
|
||||
sha256 = "1dyw275qfnpz7fs1s952b9fl9vgfzfk8aiclznfhhl43nvxxglb7";
|
||||
url = "https://elpa.nongnu.org/nongnu/magit-section-4.1.1.tar";
|
||||
sha256 = "1vbfvnmmm026zk098vxk21zh8r444cy476br4b6y20lhnniybh7s";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -3059,10 +3106,10 @@
|
||||
elpaBuild {
|
||||
pname = "mastodon";
|
||||
ename = "mastodon";
|
||||
version = "1.0.26";
|
||||
version = "1.0.27";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.26.tar";
|
||||
sha256 = "1p4nzgw8rf7zx4z17nn7bdh106qdhb54m20dkkz43wr4dgqp61bn";
|
||||
url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.27.tar";
|
||||
sha256 = "0kbbzmqnnh0pvd215660p1c2wljnxr5139vs17k9cnh8n5qsddjr";
|
||||
};
|
||||
packageRequires = [
|
||||
persist
|
||||
@@ -3400,10 +3447,10 @@
|
||||
elpaBuild {
|
||||
pname = "org-contrib";
|
||||
ename = "org-contrib";
|
||||
version = "0.4.2";
|
||||
version = "0.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/org-contrib-0.4.2.tar";
|
||||
sha256 = "1v1g359dqyq8h4y5rjhllc93dq1vysnfk23lqn3smdvdi3ba9zlr";
|
||||
url = "https://elpa.nongnu.org/nongnu/org-contrib-0.6.tar";
|
||||
sha256 = "02rpy7psjp1mj2nbzzbc06i4961m83hkq5ndks56mfkcz4hdhj2m";
|
||||
};
|
||||
packageRequires = [ org ];
|
||||
meta = {
|
||||
@@ -3471,10 +3518,10 @@
|
||||
elpaBuild {
|
||||
pname = "org-mime";
|
||||
ename = "org-mime";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/org-mime-0.3.3.tar";
|
||||
sha256 = "1ylsdfifa4ykrf5vncnnj6v2bgc3ixlskgxb1v7qggmkb5mzy2yv";
|
||||
url = "https://elpa.nongnu.org/nongnu/org-mime-0.3.4.tar";
|
||||
sha256 = "06ard0fndp1iffd8lqqrf4dahbxkh76blava9s6xzxf75zzmlsyj";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -3633,10 +3680,10 @@
|
||||
elpaBuild {
|
||||
pname = "package-lint";
|
||||
ename = "package-lint";
|
||||
version = "0.23";
|
||||
version = "0.24";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/package-lint-0.23.tar";
|
||||
sha256 = "116kc7j0g2r8fzyb07b7xb767wzjqnigi504r0rb7cc93b44c4gg";
|
||||
url = "https://elpa.nongnu.org/nongnu/package-lint-0.24.tar";
|
||||
sha256 = "1cdm86vyi3whq2gmb3dfkzir6hx2pf5m0yxg8pfj7ja31jfi4r25";
|
||||
};
|
||||
packageRequires = [ let-alist ];
|
||||
meta = {
|
||||
@@ -3833,10 +3880,10 @@
|
||||
elpaBuild {
|
||||
pname = "php-mode";
|
||||
ename = "php-mode";
|
||||
version = "1.25.1";
|
||||
version = "1.26.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/php-mode-1.25.1.tar";
|
||||
sha256 = "1cfk7nq5x2p4adcf6q9igsh2jm0sdmsaf5l2sqx4idda28vp3gwc";
|
||||
url = "https://elpa.nongnu.org/nongnu/php-mode-1.26.1.tar";
|
||||
sha256 = "151hk9kmwlaq243qfwh2s1vqk5xsyikl9gj5b65ywhhf326dirz1";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -3960,10 +4007,10 @@
|
||||
elpaBuild {
|
||||
pname = "racket-mode";
|
||||
ename = "racket-mode";
|
||||
version = "1.0.20240813.124142";
|
||||
version = "1.0.20241001.105847";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240813.124142.tar";
|
||||
sha256 = "0arsrq5lp8a6s6gh2dwc4m43f7gmhrwlpgxn6xsglscpvhlrair8";
|
||||
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20241001.105847.tar";
|
||||
sha256 = "0wwg30wbigmnb7yz9wc2yrq58jzysd2vp1g2324lbc95z61ng5yd";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -4128,10 +4175,10 @@
|
||||
elpaBuild {
|
||||
pname = "rust-mode";
|
||||
ename = "rust-mode";
|
||||
version = "1.0.5";
|
||||
version = "1.0.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.5.tar";
|
||||
sha256 = "1cilbf4yw4723bn1vh9ww79875fxh0r1j2c7wxjqfjk5xnx4s6q4";
|
||||
url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.6.tar";
|
||||
sha256 = "1x2hj5rhdcm9hdnr78430jh1ycwjiva5vv7xqm7758vcxw7x0nag";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -4488,10 +4535,10 @@
|
||||
elpaBuild {
|
||||
pname = "subed";
|
||||
ename = "subed";
|
||||
version = "1.2.14";
|
||||
version = "1.2.16";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-1.2.14.tar";
|
||||
sha256 = "0kzb054radxq9hqviadmbr4cln39yp7yz4inq4ip52rd3qdm8vy4";
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-1.2.16.tar";
|
||||
sha256 = "0fsxsp8g70mr36njmv2h3qrmp1mw3r4clrlzib33iq02wmw7q3rg";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -4510,10 +4557,10 @@
|
||||
elpaBuild {
|
||||
pname = "sweeprolog";
|
||||
ename = "sweeprolog";
|
||||
version = "0.27.5";
|
||||
version = "0.27.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.27.5.tar";
|
||||
sha256 = "0mw8fddzcbn9h5l55v12n4nmickqdxc3y7y0xfzm6m42cvqkzdzf";
|
||||
url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.27.6.tar";
|
||||
sha256 = "063bindr1rfbpa59nf0zrjq3axj3siiskaxd7d37pada411j654i";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -4532,10 +4579,10 @@
|
||||
elpaBuild {
|
||||
pname = "swift-mode";
|
||||
ename = "swift-mode";
|
||||
version = "9.1.0";
|
||||
version = "9.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/swift-mode-9.1.0.tar";
|
||||
sha256 = "1h7fbrgp2jsn0nk6c84vzvipm86macxf2975l0av8gxv0kpzcaiv";
|
||||
url = "https://elpa.nongnu.org/nongnu/swift-mode-9.2.0.tar";
|
||||
sha256 = "1mnkwy7cglwrfln8hknbxyzg4z6zb6cmycl19acxslbgrviwh9j3";
|
||||
};
|
||||
packageRequires = [ seq ];
|
||||
meta = {
|
||||
@@ -4571,16 +4618,17 @@
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
seq,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "symbol-overlay";
|
||||
ename = "symbol-overlay";
|
||||
version = "4.1";
|
||||
version = "4.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/symbol-overlay-4.1.tar";
|
||||
sha256 = "0l877zm8fbf6qqcg7zx26w32x885axcj01l4y1m98jzryjhszfgn";
|
||||
url = "https://elpa.nongnu.org/nongnu/symbol-overlay-4.3.tar";
|
||||
sha256 = "0f27axzjbrh4nx6ixpjbb8vx7s2y6l074cdqzia1c87a8b6301c6";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
packageRequires = [ seq ];
|
||||
meta = {
|
||||
homepage = "https://elpa.nongnu.org/nongnu/symbol-overlay.html";
|
||||
license = lib.licenses.free;
|
||||
@@ -5073,10 +5121,10 @@
|
||||
elpaBuild {
|
||||
pname = "with-editor";
|
||||
ename = "with-editor";
|
||||
version = "3.4.1";
|
||||
version = "3.4.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/with-editor-3.4.1.tar";
|
||||
sha256 = "0nhlr2qjn351p0vd8vdnrwsb6wi2klh5ny84k90m8kzwcmvglhfd";
|
||||
url = "https://elpa.nongnu.org/nongnu/with-editor-3.4.2.tar";
|
||||
sha256 = "0z6zi271p2ch4gylkz4ynj44hyxjmvvmg7xjsxwjmsyi800kwr58";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -5183,10 +5231,10 @@
|
||||
elpaBuild {
|
||||
pname = "xah-fly-keys";
|
||||
ename = "xah-fly-keys";
|
||||
version = "25.9.20240725161125";
|
||||
version = "26.6.20241009212806";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.9.20240725161125.tar";
|
||||
sha256 = "1kkis9qrfks40dlibkn4f75al0h61ixdw30a45ql09nsg4n5rzky";
|
||||
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-26.6.20241009212806.tar";
|
||||
sha256 = "17xyb1dvsi2hqnhhk8vzbrskhlbh6w869c1iy14cdy3yndj7y8v2";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -10,8 +10,7 @@
|
||||
, libgit2-glib
|
||||
, gi-docgen
|
||||
, gobject-introspection
|
||||
, enchant
|
||||
, icu
|
||||
, gom
|
||||
, gtk4
|
||||
, gtksourceview5
|
||||
, json-glib
|
||||
@@ -21,12 +20,12 @@
|
||||
, libpanel
|
||||
, libpeas2
|
||||
, libportal-gtk4
|
||||
, libspelling
|
||||
, libsysprof-capture
|
||||
, libxml2
|
||||
, meson
|
||||
, ninja
|
||||
, ostree
|
||||
, d-spy
|
||||
, pcre2
|
||||
, pkg-config
|
||||
, python3
|
||||
@@ -42,13 +41,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-builder";
|
||||
version = "46.3";
|
||||
version = "47.1";
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-builder/${lib.versions.major finalAttrs.version}/gnome-builder-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-EvJ8DipKcxb59+IYWd9r8bd1cNKWb5V6QzBvaZ7FRhI=";
|
||||
hash = "sha256-5vduvPbFXMmC1EYAWdPRVtm0ESf7erZg7LqdyWBok8U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -85,8 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libpeas2
|
||||
libportal-gtk4
|
||||
vte-gtk4
|
||||
enchant
|
||||
icu
|
||||
gom
|
||||
gtk4
|
||||
gtksourceview5
|
||||
json-glib
|
||||
@@ -94,10 +92,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libadwaita
|
||||
libdex
|
||||
libpanel
|
||||
libspelling
|
||||
libsysprof-capture
|
||||
libxml2
|
||||
ostree
|
||||
d-spy
|
||||
pcre2
|
||||
python3
|
||||
template-glib
|
||||
|
||||
@@ -13,9 +13,7 @@
|
||||
, lua53Packages
|
||||
, perlPackages
|
||||
, gtk3
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, IOKit
|
||||
, apple-sdk_11
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -36,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
++ (with lua53Packages; [ lua busted ])
|
||||
++ (with perlPackages; [ perl TemplateToolkit ])
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa IOKit ];
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
|
||||
|
||||
makeFlags = [
|
||||
"prefix=${placeholder "out"}"
|
||||
@@ -44,6 +42,10 @@ stdenv.mkDerivation rec {
|
||||
"CXXSTD=-std=c++20"
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-f Makefile.osx" ];
|
||||
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
NIX_LDFLAGS = "-liconv";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -94,6 +94,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cppflags = map (drv: "-isystem ${lib.getDev drv}/include") inputs;
|
||||
in
|
||||
''
|
||||
unset DEVELOPER_DIR # Use the system Xcode not the nixpkgs SDK.
|
||||
|
||||
CC=/usr/bin/clang
|
||||
|
||||
DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ stdenv
|
||||
, stdenvNoCC
|
||||
, lib
|
||||
, callPackage
|
||||
, fetchurl
|
||||
@@ -70,6 +71,7 @@ in
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
sha256 = "1chk0xwsiw6pm6ihjlp9695n0l1wfipwv4h04v5dmm9dcwlarp1m";
|
||||
};
|
||||
stdenv = stdenvNoCC;
|
||||
};
|
||||
|
||||
tests = { inherit (nixosTests) vscode-remote-ssh; };
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
wineRelease,
|
||||
patches,
|
||||
moltenvk,
|
||||
buildScript ? null, configureFlags ? [], mainProgram ? "wine"
|
||||
buildScript ? null, configureFlags ? [], mainProgram ? "wine",
|
||||
}:
|
||||
|
||||
with import ./util.nix { inherit lib; };
|
||||
@@ -23,12 +23,10 @@ let
|
||||
};
|
||||
} ./setup-hook-darwin.sh;
|
||||
|
||||
darwinFrameworks = lib.optionals stdenv.hostPlatform.isDarwin (
|
||||
toBuildInputs pkgArches (pkgs: with pkgs.buildPackages.darwin.apple_sdk.frameworks; [
|
||||
CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration PCSC Security
|
||||
ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon
|
||||
])
|
||||
);
|
||||
# Using the 14.4 SDK allows Wine to use `os_sync_wait_on_address` for its futex implementation on Darwin.
|
||||
# It does an availability check, so older systems will still work.
|
||||
darwinFrameworks = lib.optionals stdenv.hostPlatform.isDarwin (toBuildInputs pkgArches (pkgs: [ pkgs.apple-sdk_14 ]));
|
||||
|
||||
# Building Wine with these flags isn’t supported on Darwin. Using any of them will result in an evaluation failures
|
||||
# because they will put Darwin in `meta.badPlatforms`.
|
||||
darwinUnsupportedFlags = [
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
waylandSupport ? false,
|
||||
x11Support ? false,
|
||||
embedInstallers ? false, # The Mono and Gecko MSI installers
|
||||
moltenvk ? darwin.moltenvk # Allow users to override MoltenVK easily
|
||||
moltenvk # Allow users to override MoltenVK easily
|
||||
}:
|
||||
|
||||
let wine-build = build: release:
|
||||
|
||||
@@ -27,8 +27,8 @@
|
||||
, nixosTests
|
||||
, pkg-config
|
||||
, python3
|
||||
, tracker
|
||||
, tracker-miners
|
||||
, tinysparql
|
||||
, localsearch
|
||||
, wrapGAppsHook3
|
||||
}:
|
||||
|
||||
@@ -80,8 +80,8 @@ stdenv.mkDerivation rec {
|
||||
libdazzle
|
||||
libportal-gtk3
|
||||
libhandy
|
||||
tracker
|
||||
tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema
|
||||
tinysparql
|
||||
localsearch # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema
|
||||
|
||||
at-spi2-core # for tests
|
||||
];
|
||||
|
||||
@@ -1,9 +1,12 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, glycin-loaders
|
||||
, cargo
|
||||
, desktop-file-utils
|
||||
, jq
|
||||
, meson
|
||||
, moreutils
|
||||
, ninja
|
||||
, pkg-config
|
||||
, rustc
|
||||
@@ -12,23 +15,32 @@
|
||||
, gst_all_1
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, libcamera
|
||||
, libseccomp
|
||||
, pipewire
|
||||
, gnome
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "snapshot";
|
||||
version = "46.3";
|
||||
version = "47.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-RZV6BBX0VNY1MUkaoEeVzuDO1O3d1dj6DQAPXvBzW2c=";
|
||||
hash = "sha256-5LFiZ5ryTH6W7m4itH1f8NqW4KD2FtE66xIHxgn4lIM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix paths in glycin library
|
||||
glycin-loaders.passthru.glycinPathsPatch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
desktop-file-utils
|
||||
jq
|
||||
meson
|
||||
moreutils # sponge is used in postPatch
|
||||
ninja
|
||||
pkg-config
|
||||
rustc
|
||||
@@ -40,16 +52,30 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-plugins-rs # for gtk4paintablesink
|
||||
gst_all_1.gstreamer
|
||||
gtk4
|
||||
libadwaita
|
||||
libcamera # for the gstreamer plugin
|
||||
libseccomp
|
||||
pipewire # for device provider
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Replace hash of file we patch in vendored glycin.
|
||||
jq \
|
||||
--arg hash "$(sha256sum vendor/glycin/src/sandbox.rs | cut -d' ' -f 1)" \
|
||||
'.files."src/sandbox.rs" = $hash' \
|
||||
vendor/glycin/.cargo-checksum.json \
|
||||
| sponge vendor/glycin/.cargo-checksum.json
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
# vp8enc preset
|
||||
--prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets"
|
||||
# See https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44
|
||||
--prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
|
||||
)
|
||||
'';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, darwin, aalib, ncurses, xorg, libmikmod }:
|
||||
{ stdenv, lib, fetchurl, autoreconfHook, aalib, ncurses, xorg, libmikmod }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bb";
|
||||
@@ -9,19 +9,24 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1i411glxh7g4pfg4gw826lpwngi89yrbmxac8jmnsfvrfb48hgbr";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# add / update include files to get function prototypes
|
||||
./included-files-updates.diff
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
buildInputs = [
|
||||
aalib ncurses libmikmod
|
||||
xorg.libXau xorg.libXdmcp xorg.libX11
|
||||
] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.CoreAudio;
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
sed -i -e '/^#include <malloc.h>$/d' *.c
|
||||
# regparm attribute is not supported by clang
|
||||
postPatch = lib.optionalString stdenv.cc.isClang ''
|
||||
substituteInPlace config.h \
|
||||
--replace-fail "__attribute__ ((regparm(n)))" ""
|
||||
'';
|
||||
|
||||
# error: 'regparm' is not valid on this platform
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
|
||||
"-D__STRICT_ANSI__";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://aa-project.sourceforge.net/bb";
|
||||
description = "AA-lib demo";
|
||||
|
||||
@@ -0,0 +1,145 @@
|
||||
diff --git a/bb.c b/bb.c
|
||||
index 95850ef..6a7cc78 100644
|
||||
--- a/bb.c
|
||||
+++ b/bb.c
|
||||
@@ -23,6 +23,7 @@
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
+#include <time.h>
|
||||
#include <ctype.h>
|
||||
#include <aalib.h>
|
||||
#include "bb.h"
|
||||
diff --git a/credits.c b/credits.c
|
||||
index 8514579..b304d8c 100644
|
||||
--- a/credits.c
|
||||
+++ b/credits.c
|
||||
@@ -24,7 +24,6 @@
|
||||
#include <math.h>
|
||||
#include <limits.h>
|
||||
#include <string.h>
|
||||
-#include <malloc.h>
|
||||
#include <stdlib.h>
|
||||
#include "bb.h"
|
||||
#define STAR 1
|
||||
diff --git a/credits2.c b/credits2.c
|
||||
index 65d2431..9dcdf2d 100644
|
||||
--- a/credits2.c
|
||||
+++ b/credits2.c
|
||||
@@ -25,7 +25,6 @@
|
||||
#include <math.h>
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
-#include <malloc.h>
|
||||
#include <stdlib.h>
|
||||
#include "bb.h"
|
||||
#define STATE (TIME-starttime)
|
||||
diff --git a/main.c b/main.c
|
||||
index ae852a7..c0648b4 100644
|
||||
--- a/main.c
|
||||
+++ b/main.c
|
||||
@@ -21,6 +21,8 @@
|
||||
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
+#include <ctype.h>
|
||||
+#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include "timers.h"
|
||||
#include "bb.h"
|
||||
diff --git a/messager.c b/messager.c
|
||||
index 95cc410..5164577 100644
|
||||
--- a/messager.c
|
||||
+++ b/messager.c
|
||||
@@ -22,7 +22,7 @@
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
-#include <malloc.h>
|
||||
+#include <stdlib.h>
|
||||
#include "bb.h"
|
||||
|
||||
static int cursor_x, cursor_y;
|
||||
diff --git a/scene5.c b/scene5.c
|
||||
index 8d3c798..4a79258 100644
|
||||
--- a/scene5.c
|
||||
+++ b/scene5.c
|
||||
@@ -22,7 +22,7 @@
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
-#include <malloc.h>
|
||||
+#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#include "bb.h"
|
||||
#include "tex.h"
|
||||
diff --git a/scene8.c b/scene8.c
|
||||
index 2bcba1e..72ea231 100644
|
||||
--- a/scene8.c
|
||||
+++ b/scene8.c
|
||||
@@ -22,7 +22,7 @@
|
||||
*/
|
||||
|
||||
#include <math.h>
|
||||
-#include <malloc.h>
|
||||
+#include <stdlib.h>
|
||||
#include "bb.h"
|
||||
#define STATE1 (TIME-starttime1)
|
||||
#define STATE (time-starttime)
|
||||
diff --git a/textform.c b/textform.c
|
||||
index 859d367..eb9d1cb 100644
|
||||
--- a/textform.c
|
||||
+++ b/textform.c
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
-#include <malloc.h>
|
||||
+#include <stdlib.h>
|
||||
#include <aalib.h>
|
||||
#include "bb.h"
|
||||
#define MAXLINES 10000
|
||||
diff --git a/timers.c b/timers.c
|
||||
index ac822f7..6342c1b 100644
|
||||
--- a/timers.c
|
||||
+++ b/timers.c
|
||||
@@ -45,12 +45,9 @@
|
||||
#include <time.h>
|
||||
#endif
|
||||
/*HAVE_TIME_H*/
|
||||
-#include <malloc.h>
|
||||
+#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
-#ifndef _MAC
|
||||
-#include <malloc.h>
|
||||
-#endif
|
||||
#ifdef __BEOS__
|
||||
#include <OS.h>
|
||||
#endif
|
||||
diff --git a/uncompfn.c b/uncompfn.c
|
||||
index d8eaaea..bc707f8 100644
|
||||
--- a/uncompfn.c
|
||||
+++ b/uncompfn.c
|
||||
@@ -21,7 +21,7 @@
|
||||
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
-#include <malloc.h>
|
||||
+#include <stdlib.h>
|
||||
#include <aalib.h>
|
||||
#include "bb.h"
|
||||
|
||||
diff --git a/zoom.c b/zoom.c
|
||||
index 7450095..4b37b2d 100644
|
||||
--- a/zoom.c
|
||||
+++ b/zoom.c
|
||||
@@ -31,9 +31,6 @@
|
||||
#else
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
-#ifndef _MAC
|
||||
-#include <malloc.h>
|
||||
-#endif
|
||||
#ifdef __DJGPP__
|
||||
#include "aconfig.dos"
|
||||
#else
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, libX11, libXinerama, libXft, zlib, writeText
|
||||
{ lib, stdenv, fetchurl, fontconfig, libX11, libXinerama, libXft, pkg-config, zlib, writeText
|
||||
, conf ? null, patches ? null
|
||||
# update script dependencies
|
||||
, gitUpdater }:
|
||||
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-Go9T5v0tdJg57IcMXiez4U2lw+6sv8uUXRWeHVQzeV8=";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 libXinerama zlib libXft ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ fontconfig libX11 libXinerama zlib libXft ];
|
||||
|
||||
inherit patches;
|
||||
|
||||
@@ -28,11 +29,15 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk
|
||||
makeFlagsArray+=(
|
||||
PREFIX="$out"
|
||||
CC="$CC"
|
||||
# default config.mk hardcodes dependent libraries and include paths
|
||||
INCS="`$PKG_CONFIG --cflags fontconfig x11 xft xinerama`"
|
||||
LIBS="`$PKG_CONFIG --libs fontconfig x11 xft xinerama`"
|
||||
)
|
||||
'';
|
||||
|
||||
makeFlags = [ "CC:=$(CC)" ];
|
||||
|
||||
passthru.updateScript = gitUpdater { url = "git://git.suckless.org/dmenu"; };
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tecla";
|
||||
version = "46.0";
|
||||
version = "47.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/tecla/${lib.versions.major finalAttrs.version}/tecla-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-Sggeq4Z6WosJdYmRytdkWSDzI6q8qVRAgpD7b0RZGw8=";
|
||||
hash = "sha256-B5C5nsKRN6VLVGxRBmGpmqbwOcjXXxDAjpKGgsCAT+U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
, libgee
|
||||
, libgtop
|
||||
, gnome
|
||||
, tracker
|
||||
, tinysparql
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||
libadwaita
|
||||
libgee
|
||||
libgtop
|
||||
tracker
|
||||
tinysparql
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
, blueprint-compiler
|
||||
, libadwaita
|
||||
, libsecret
|
||||
, tracker
|
||||
, tinysparql
|
||||
, darwin
|
||||
}:
|
||||
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
libadwaita
|
||||
libsecret
|
||||
tracker
|
||||
tinysparql
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
darwin.apple_sdk.frameworks.Foundation
|
||||
|
||||
@@ -15,6 +15,13 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ glib gettext readline ];
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/Dushistov/sdcv/pull/104
|
||||
substituteInPlace src/stardict_lib.cpp --replace-fail \
|
||||
"gchar *nextchar = g_utf8_next_char(sWord)" \
|
||||
"gchar *nextchar = const_cast<gchar*>(g_utf8_next_char(sWord))"
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
mkdir locale
|
||||
'';
|
||||
|
||||
@@ -6,7 +6,9 @@
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wrapGAppsHook4
|
||||
, vala
|
||||
, evolution-data-server-gtk4
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, glib-networking
|
||||
, gnutls
|
||||
@@ -14,21 +16,22 @@
|
||||
, json-glib
|
||||
, libadwaita
|
||||
, libpeas2
|
||||
, libphonenumber
|
||||
, libportal-gtk4
|
||||
, pipewire
|
||||
, pulseaudio
|
||||
, sqlite
|
||||
, tinysparql
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "valent";
|
||||
version = "1.0.0.alpha.45";
|
||||
version = "1.0.0.alpha.46";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andyholmes";
|
||||
repo = "valent";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-hOVWvk4U6VoWAvXNHK1vTm/am69EFqDmSb0NofWVQj8=";
|
||||
hash = "sha256-DpDHU1l8Pot0RwVR1rL9fIhMHo18eo7nTecnSa3hG2E=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -38,10 +41,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
vala
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
evolution-data-server-gtk4
|
||||
gdk-pixbuf
|
||||
glib
|
||||
glib-networking
|
||||
gnutls
|
||||
@@ -50,16 +55,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
json-glib
|
||||
libadwaita
|
||||
libpeas2
|
||||
libphonenumber
|
||||
libportal-gtk4
|
||||
pipewire
|
||||
pulseaudio
|
||||
sqlite
|
||||
tinysparql
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dplugin_bluez=true"
|
||||
# FIXME: libpeas2 (and libpeas) not compiled with -Dvapi=true
|
||||
"-Dvapi=false"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -64,18 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace Meta/CMake/lagom_install_options.cmake \
|
||||
--replace-fail "\''${CMAKE_INSTALL_BINDIR}" "bin" \
|
||||
--replace-fail "\''${CMAKE_INSTALL_LIBDIR}" "lib"
|
||||
|
||||
# libwebp is not built with cmake support yet
|
||||
# https://github.com/NixOS/nixpkgs/issues/334148
|
||||
cat > Meta/CMake/FindWebP.cmake <<'EOF'
|
||||
find_package(PkgConfig)
|
||||
pkg_check_modules(WEBP libwebp REQUIRED)
|
||||
include_directories(''${WEBP_INCLUDE_DIRS})
|
||||
link_directories(''${WEBP_LIBRARY_DIRS})
|
||||
EOF
|
||||
substituteInPlace Userland/Libraries/LibGfx/CMakeLists.txt \
|
||||
--replace-fail 'WebP::' "" \
|
||||
--replace-fail libwebpmux webpmux
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@@ -1,25 +1,25 @@
|
||||
{ lib, stdenv, fetchFromGitHub, libmrss, libiconv }:
|
||||
{ lib, stdenv, fetchFromGitHub, libmrss }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (final: {
|
||||
pname = "rsstail";
|
||||
version = "2.1";
|
||||
version = "2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "folkertvanheusden";
|
||||
repo = "rsstail";
|
||||
rev = "6f2436185372b3f945a4989406c4b6a934fe8a95";
|
||||
sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6";
|
||||
rev = "v${final.version}";
|
||||
hash = "sha256-wbdf9zhwMN7QhJ5WoJo1Csu0EcKUTON8Q2Ic5scbn7I=";
|
||||
};
|
||||
|
||||
buildInputs = [ libmrss ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace -liconv_hook ""
|
||||
'';
|
||||
buildInputs = [ libmrss ];
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
NIX_LDFLAGS = "-liconv";
|
||||
};
|
||||
|
||||
# just runs cppcheck linter
|
||||
doCheck = false;
|
||||
|
||||
@@ -31,8 +31,8 @@ stdenv.mkDerivation {
|
||||
detects a new entry it'll emit only that new entry.
|
||||
'';
|
||||
homepage = "https://www.vanheusden.com/rsstail/";
|
||||
license = licenses.gpl2Plus;
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = [ maintainers.Necior ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -22,11 +22,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-ews";
|
||||
version = "3.52.4";
|
||||
version = "3.54.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-QI1VBWyA5K1kR+PHeINodYIfbCYdNepxF1YocPAvY7o=";
|
||||
hash = "sha256-EZIOIudgpOv9s3aeZgE3He3YDA16N9TCN1i0RKo/Ftg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
+25
-49
@@ -1,28 +1,3 @@
|
||||
diff --git a/src/EWS/calendar/e-cal-backend-ews-utils.c b/src/EWS/calendar/e-cal-backend-ews-utils.c
|
||||
index 87b02c6..3fabca6 100644
|
||||
--- a/src/EWS/calendar/e-cal-backend-ews-utils.c
|
||||
+++ b/src/EWS/calendar/e-cal-backend-ews-utils.c
|
||||
@@ -2484,7 +2484,19 @@ e_cal_backend_ews_get_configured_evolution_icaltimezone (void)
|
||||
if (schema) {
|
||||
GSettings *settings;
|
||||
|
||||
- settings = g_settings_new ("org.gnome.evolution.calendar");
|
||||
+ {
|
||||
+ g_autoptr(GSettingsSchemaSource) schema_source;
|
||||
+ g_autoptr(GSettingsSchema) schema;
|
||||
+ schema_source = g_settings_schema_source_new_from_directory("@evo@",
|
||||
+ g_settings_schema_source_get_default(),
|
||||
+ TRUE,
|
||||
+ NULL);
|
||||
+ schema = g_settings_schema_source_lookup(schema_source,
|
||||
+ "org.gnome.evolution.calendar",
|
||||
+ FALSE);
|
||||
+ settings = g_settings_new_full(schema, NULL,
|
||||
+ NULL);
|
||||
+ }
|
||||
|
||||
if (g_settings_get_boolean (settings, "use-system-timezone"))
|
||||
location = e_cal_util_get_system_timezone_location ();
|
||||
diff --git a/src/EWS/camel/camel-ews-utils.c b/src/EWS/camel/camel-ews-utils.c
|
||||
index 44a20d6..90d5729 100644
|
||||
--- a/src/EWS/camel/camel-ews-utils.c
|
||||
@@ -47,30 +22,6 @@ index 44a20d6..90d5729 100644
|
||||
strv = g_settings_get_strv (settings, "labels");
|
||||
|
||||
for (ii = 0; strv && strv[ii]; ii++) {
|
||||
diff --git a/src/EWS/common/e-ews-calendar-utils.c b/src/EWS/common/e-ews-calendar-utils.c
|
||||
index 6deda60..9b44cc7 100644
|
||||
--- a/src/EWS/common/e-ews-calendar-utils.c
|
||||
+++ b/src/EWS/common/e-ews-calendar-utils.c
|
||||
@@ -413,7 +413,18 @@ ews_get_configured_icaltimezone (void)
|
||||
gchar *location;
|
||||
ICalTimezone *zone = NULL;
|
||||
|
||||
- settings = g_settings_new ("org.gnome.evolution.calendar");
|
||||
+ {
|
||||
+ g_autoptr(GSettingsSchemaSource) schema_source;
|
||||
+ g_autoptr(GSettingsSchema) schema;
|
||||
+ schema_source = g_settings_schema_source_new_from_directory("@evo@",
|
||||
+ g_settings_schema_source_get_default(),
|
||||
+ TRUE,
|
||||
+ NULL);
|
||||
+ schema = g_settings_schema_source_lookup(schema_source,
|
||||
+ "org.gnome.evolution.calendar",
|
||||
+ FALSE);
|
||||
+ settings = g_settings_new_full(schema, NULL, NULL);
|
||||
+ }
|
||||
location = g_settings_get_string (settings, "timezone");
|
||||
if (location) {
|
||||
zone = i_cal_timezone_get_builtin_timezone (location);
|
||||
diff --git a/src/Microsoft365/camel/camel-m365-store.c b/src/Microsoft365/camel/camel-m365-store.c
|
||||
index 3db3564..a233d4d 100644
|
||||
--- a/src/Microsoft365/camel/camel-m365-store.c
|
||||
@@ -119,3 +70,28 @@ index 7a1d7f4..3c0d5e1 100644
|
||||
|
||||
if (g_settings_get_boolean (settings, "use-system-timezone"))
|
||||
location = e_cal_util_get_system_timezone_location ();
|
||||
diff --git a/src/common/e-ews-common-utils.c b/src/common/e-ews-common-utils.c
|
||||
index 5017d40..34547e3 100644
|
||||
--- a/src/common/e-ews-common-utils.c
|
||||
+++ b/src/common/e-ews-common-utils.c
|
||||
@@ -218,7 +218,19 @@ e_ews_common_utils_get_configured_icaltimezone (void)
|
||||
if (schema) {
|
||||
GSettings *settings;
|
||||
|
||||
- settings = g_settings_new ("org.gnome.evolution.calendar");
|
||||
+ {
|
||||
+ g_autoptr(GSettingsSchemaSource) schema_source;
|
||||
+ g_autoptr(GSettingsSchema) schema;
|
||||
+ schema_source = g_settings_schema_source_new_from_directory("@evo@",
|
||||
+ g_settings_schema_source_get_default(),
|
||||
+ TRUE,
|
||||
+ NULL);
|
||||
+ schema = g_settings_schema_source_lookup(schema_source,
|
||||
+ "org.gnome.evolution.calendar",
|
||||
+ FALSE);
|
||||
+ settings = g_settings_new_full(schema, NULL,
|
||||
+ NULL);
|
||||
+ }
|
||||
|
||||
if (g_settings_get_boolean (settings, "use-system-timezone"))
|
||||
location = e_cal_util_get_system_timezone_location ();
|
||||
|
||||
@@ -45,11 +45,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution";
|
||||
version = "3.52.4";
|
||||
version = "3.54.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-9XkpgB1uQBphHWUh71kiTYGzBQA1ekuePkYkXslGGBk=";
|
||||
hash = "sha256-qlLXP76wmgk/gZHHJ6ERVCkOVdBHNRJaw5eBTrWGz58=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,7 +18,7 @@ buildPythonApplication rec {
|
||||
propagatedBuildInputs = [ appdirs colorama python-dateutil fusepy requests
|
||||
requests-toolbelt setuptools sqlalchemy ];
|
||||
|
||||
makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ];
|
||||
makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${lib.getLib fuse}/lib/libfuse.so" ];
|
||||
|
||||
postFixup = ''
|
||||
function lnOverBin() {
|
||||
|
||||
@@ -18,17 +18,8 @@
|
||||
, wxGTK32
|
||||
, makeWrapper
|
||||
, stdenv
|
||||
, AppKit
|
||||
, Cocoa
|
||||
, Foundation
|
||||
, IOKit
|
||||
, Kernel
|
||||
, AVFoundation
|
||||
, Carbon
|
||||
, QTKit
|
||||
, AVKit
|
||||
, WebKit
|
||||
, System
|
||||
, apple-sdk_11
|
||||
, darwinMinVersionHook
|
||||
, waylandSupport ? false
|
||||
, x11Support ? stdenv.hostPlatform.isLinux
|
||||
, testers
|
||||
@@ -83,17 +74,8 @@ rustPlatform.buildRustPackage rec {
|
||||
libnotify
|
||||
libxkbcommon
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
AppKit
|
||||
Cocoa
|
||||
Foundation
|
||||
IOKit
|
||||
Kernel
|
||||
AVFoundation
|
||||
Carbon
|
||||
QTKit
|
||||
AVKit
|
||||
WebKit
|
||||
System
|
||||
apple-sdk_11
|
||||
(darwinMinVersionHook "10.13")
|
||||
] ++ lib.optionals waylandSupport [
|
||||
wl-clipboard
|
||||
] ++ lib.optionals x11Support [
|
||||
@@ -148,13 +130,6 @@ rustPlatform.buildRustPackage rec {
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ kimat pyrox0 n8henrie ];
|
||||
platforms = platforms.unix;
|
||||
# With apple_sdk_10_12,
|
||||
# kCFURLVolumeAvailableCapacityForImportantUsageKey
|
||||
# is undefined.
|
||||
# With apple_sdk_11_0, there is an issue with
|
||||
# kColorSyncGenericGrayProfile.
|
||||
broken = stdenv.hostPlatform.system == "x86_64-darwin";
|
||||
|
||||
|
||||
longDescription = ''
|
||||
Espanso detects when you type a keyword and replaces it while you're typing.
|
||||
|
||||
@@ -257,6 +257,10 @@ python.pkgs.buildPythonApplication rec {
|
||||
"testNormalOperation"
|
||||
# Something broken with new Tesseract and inline RTL/LTR overrides?
|
||||
"test_rtl_language_detection"
|
||||
# Broke during the pytest-httpx 0.30.0 -> 0.32.0 upgrade
|
||||
"test_request_pdf_a_format"
|
||||
"test_generate_pdf_html_email"
|
||||
"test_generate_pdf_html_email_merge_failure"
|
||||
];
|
||||
|
||||
doCheck = !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
@@ -73,12 +73,26 @@ stdenv.mkDerivation rec {
|
||||
# should come from or be proposed to upstream. This list will probably never
|
||||
# be empty since dependencies update all the time.
|
||||
packageUpgradePatches = [
|
||||
# https://github.com/sagemath/sage/pull/38500, positively reviewed, to land in 10.5.beta3
|
||||
# https://github.com/sagemath/sage/pull/38500, landed in 10.5.beta3
|
||||
(fetchpatch {
|
||||
name = "cython-3.0.11-upgrade.patch";
|
||||
url = "https://patch-diff.githubusercontent.com/raw/sagemath/sage/pull/38500.diff";
|
||||
hash = "sha256-ePfH3Gy1T0UfpoVd3EZowCfy88CbE+yE2MV2itWthsA=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/36641, landed in 10.5.beta3
|
||||
(fetchpatch {
|
||||
name = "sympy-1.13.2-update.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/100189fa62f9a40e7aa0d856615366ea99b87aff.diff";
|
||||
sha256 = "sha256-uWr3I15WByQYGVxbJFqG4zUJ7c7+4rjkcgwkAT85O7w=";
|
||||
})
|
||||
|
||||
# https://github.com/sagemath/sage/pull/38250, landed in 10.5.beta0
|
||||
(fetchpatch {
|
||||
name = "numpy-2.0-compat.patch";
|
||||
url = "https://github.com/sagemath/sage/commit/0962e0bcb159d342e7c7d83557a71e7b670fff47.diff";
|
||||
sha256 = "sha256-4SBhgPgT9VsBxcBH8+T5uYtWzYP5tZi9+iKOG55hWgI=";
|
||||
})
|
||||
];
|
||||
|
||||
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
, libgtop
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, pango
|
||||
, pcre2
|
||||
, vte-gtk4
|
||||
, desktop-file-utils
|
||||
@@ -18,11 +19,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-console";
|
||||
version = "46.0";
|
||||
version = "47.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-FhnOcBdzssDJA3GPVHaMGS6lB0UU1VoXdKkslyMdbD4=";
|
||||
hash = "sha256-0/YAtFtRcWaRrukocDMunJqMqJ1VNWXzEx2eKAdHJdA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -38,10 +39,17 @@ stdenv.mkDerivation rec {
|
||||
libgtop
|
||||
gtk4
|
||||
libadwaita
|
||||
pango
|
||||
pcre2
|
||||
vte-gtk4
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
# FIXME: properly address https://github.com/NixOS/nixpkgs/pull/333911#issuecomment-2362710334
|
||||
# and https://gitlab.gnome.org/GNOME/console/-/commit/c81801c82f186f20
|
||||
gappsWrapperArgs+=(--set "TERM" "xterm-256color")
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "gnome-console";
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
, gzip # needed at runtime by gitweb.cgi
|
||||
, withSsh ? false
|
||||
, sysctl
|
||||
, deterministic-host-uname # trick Makefile into targeting the host platform when cross-compiling
|
||||
, doInstallCheck ? !stdenv.hostPlatform.isDarwin # extremely slow on darwin
|
||||
, tests
|
||||
}:
|
||||
@@ -29,7 +30,7 @@ assert sendEmailSupport -> perlSupport;
|
||||
assert svnSupport -> perlSupport;
|
||||
|
||||
let
|
||||
version = "2.46.1";
|
||||
version = "2.47.0";
|
||||
svn = subversionClient.override { perlBindings = perlSupport; };
|
||||
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
|
||||
in
|
||||
@@ -42,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
|
||||
hash = "sha256-iIyvuL1qtMu+vBaAQKiFDrCI+B3DrCYXGVz8CHfw9UM=";
|
||||
hash = "sha256-HOEU2ohwQnG0PgJ8UeBNk5n4yI6e91Qtrnrrrn2HvE4=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional withManual "doc";
|
||||
@@ -84,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
done
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ gettext perlPackages.perl makeWrapper pkg-config ]
|
||||
nativeBuildInputs = [ deterministic-host-uname gettext perlPackages.perl makeWrapper pkg-config ]
|
||||
++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
|
||||
docbook_xsl docbook_xml_dtd_45 libxslt ];
|
||||
buildInputs = [ curl openssl zlib expat cpio (if stdenv.hostPlatform.isFreeBSD then libiconvReal else libiconv) bash ]
|
||||
@@ -130,8 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# acceptable version.
|
||||
#
|
||||
# See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin "TKFRAMEWORK=/nonexistent"
|
||||
++ lib.optional (stdenv.hostPlatform.isFreeBSD && stdenv.hostPlatform != stdenv.buildPlatform) "uname_S=FreeBSD";
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin "TKFRAMEWORK=/nonexistent";
|
||||
|
||||
disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
stdenv.shellPackage
|
||||
|
||||
@@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-b+9bwJ87VV6rbOPobkwMkDXGH34STjYPlt8wCRR5tEc=";
|
||||
};
|
||||
|
||||
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
NIX_LDFLAGS = "-liconv";
|
||||
};
|
||||
|
||||
buildInputs = [ (callPackage ./romkatv_libgit2.nix { }) ];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
diff --git a/osdep/mac/input_helper.swift b/osdep/mac/input_helper.swift
|
||||
index 0acec6bd40..0ec5837864 100644
|
||||
--- a/osdep/mac/input_helper.swift
|
||||
+++ b/osdep/mac/input_helper.swift
|
||||
@@ -18,6 +18,14 @@
|
||||
import Cocoa
|
||||
import Carbon.HIToolbox
|
||||
|
||||
+extension NSCondition {
|
||||
+ fileprivate func withLock<T>(_ body: () throws -> T) rethrows -> T {
|
||||
+ self.lock()
|
||||
+ defer { self.unlock() }
|
||||
+ return try body()
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
class InputHelper: NSObject {
|
||||
var option: OptionHelper?
|
||||
var lock = NSCondition()
|
||||
@@ -7,7 +7,6 @@
|
||||
buildPackages,
|
||||
callPackage,
|
||||
config,
|
||||
darwin,
|
||||
docutils,
|
||||
fetchFromGitHub,
|
||||
ffmpeg,
|
||||
@@ -15,15 +14,11 @@
|
||||
freetype,
|
||||
lcms2,
|
||||
libGL,
|
||||
libGLU,
|
||||
libX11,
|
||||
libXScrnSaver,
|
||||
libXext,
|
||||
libXinerama,
|
||||
libXpresent,
|
||||
libXrandr,
|
||||
libXv,
|
||||
libXxf86vm,
|
||||
libarchive,
|
||||
libass,
|
||||
libbluray,
|
||||
@@ -33,19 +28,17 @@
|
||||
libcdio-paranoia,
|
||||
libdrm,
|
||||
libdvdnav,
|
||||
libiconv,
|
||||
libjack2,
|
||||
libplacebo,
|
||||
libpng,
|
||||
libpthreadstubs,
|
||||
libpulseaudio,
|
||||
libsixel,
|
||||
libtheora,
|
||||
libuchardet,
|
||||
libva,
|
||||
libvdpau,
|
||||
libxkbcommon,
|
||||
lua,
|
||||
makeWrapper,
|
||||
mesa,
|
||||
meson,
|
||||
mujs,
|
||||
@@ -58,7 +51,6 @@
|
||||
python3,
|
||||
rubberband,
|
||||
shaderc, # instead of spirv-cross
|
||||
speex,
|
||||
stdenv,
|
||||
swift,
|
||||
testers,
|
||||
@@ -68,7 +60,6 @@
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
wayland-scanner,
|
||||
xcbuild,
|
||||
zimg,
|
||||
|
||||
# Boolean
|
||||
@@ -81,59 +72,28 @@
|
||||
cmsSupport ? true,
|
||||
drmSupport ? stdenv.hostPlatform.isLinux,
|
||||
dvbinSupport ? stdenv.hostPlatform.isLinux,
|
||||
dvdnavSupport ? stdenv.hostPlatform.isLinux,
|
||||
dvdnavSupport ? true,
|
||||
jackaudioSupport ? false,
|
||||
javascriptSupport ? true,
|
||||
libpngSupport ? true,
|
||||
openalSupport ? true,
|
||||
pipewireSupport ? stdenv.hostPlatform.isLinux,
|
||||
pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
|
||||
pipewireSupport ? !stdenv.hostPlatform.isDarwin,
|
||||
pulseSupport ? config.pulseaudio or (!stdenv.hostPlatform.isDarwin),
|
||||
rubberbandSupport ? true,
|
||||
screenSaverSupport ? true,
|
||||
sdl2Support ? !stdenv.hostPlatform.isDarwin,
|
||||
sdl2Support ? false,
|
||||
sixelSupport ? false,
|
||||
speexSupport ? true,
|
||||
swiftSupport ? stdenv.hostPlatform.isDarwin,
|
||||
theoraSupport ? true,
|
||||
vaapiSupport ? x11Support || waylandSupport,
|
||||
vaapiSupport ? !stdenv.hostPlatform.isDarwin && (x11Support || waylandSupport),
|
||||
vapoursynthSupport ? false,
|
||||
vdpauSupport ? true,
|
||||
vulkanSupport ? stdenv.hostPlatform.isLinux,
|
||||
waylandSupport ? stdenv.hostPlatform.isLinux,
|
||||
x11Support ? stdenv.hostPlatform.isLinux,
|
||||
xineramaSupport ? stdenv.hostPlatform.isLinux,
|
||||
xvSupport ? stdenv.hostPlatform.isLinux,
|
||||
vulkanSupport ? true,
|
||||
waylandSupport ? !stdenv.hostPlatform.isDarwin,
|
||||
x11Support ? !stdenv.hostPlatform.isDarwin,
|
||||
zimgSupport ? true,
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (darwin.apple_sdk_11_0.frameworks)
|
||||
AVFoundation
|
||||
Accelerate
|
||||
Cocoa
|
||||
CoreAudio
|
||||
CoreFoundation
|
||||
CoreMedia
|
||||
MediaPlayer
|
||||
VideoToolbox
|
||||
;
|
||||
luaEnv = lua.withPackages (ps: with ps; [ luasocket ]);
|
||||
|
||||
overrideSDK =
|
||||
platform: version:
|
||||
platform // lib.optionalAttrs (platform ? darwinMinVersion) { darwinMinVersion = version; };
|
||||
|
||||
stdenv' =
|
||||
if swiftSupport && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then
|
||||
stdenv.override (old: {
|
||||
buildPlatform = overrideSDK old.buildPlatform "11.0";
|
||||
hostPlatform = overrideSDK old.hostPlatform "11.0";
|
||||
targetPlatform = overrideSDK old.targetPlatform "11.0";
|
||||
})
|
||||
else
|
||||
stdenv;
|
||||
in
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mpv";
|
||||
version = "0.39.0";
|
||||
|
||||
@@ -151,18 +111,13 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-BOGh+QBTO7hrHohh+RqjSF8eHQH8jVBPjG/k4eyFaaM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with Darwin SDK 11
|
||||
./0001-fix-darwin-build.patch
|
||||
];
|
||||
|
||||
postPatch = lib.concatStringsSep "\n" [
|
||||
# Don't reference compile time dependencies or create a build outputs cycle
|
||||
# between out and dev
|
||||
''
|
||||
substituteInPlace meson.build \
|
||||
--replace-fail "conf_data.set_quoted('CONFIGURATION', configuration)" \
|
||||
"conf_data.set_quoted('CONFIGURATION', '<ommited>')"
|
||||
"conf_data.set_quoted('CONFIGURATION', '<omitted>')"
|
||||
''
|
||||
# A trick to patchShebang everything except mpv_identify.sh
|
||||
''
|
||||
@@ -174,30 +129,16 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
''
|
||||
];
|
||||
|
||||
# Ensure we reference 'lib' (not 'out') of Swift.
|
||||
preConfigure = lib.optionalString swiftSupport ''
|
||||
export SWIFT_LIB_DYNAMIC="${lib.getLib swift.swift}/lib/swift/macosx"
|
||||
'';
|
||||
|
||||
mesonFlags =
|
||||
[
|
||||
(lib.mesonOption "default_library" "shared")
|
||||
(lib.mesonBool "libmpv" true)
|
||||
(lib.mesonEnable "libarchive" archiveSupport)
|
||||
(lib.mesonEnable "manpage-build" true)
|
||||
(lib.mesonEnable "cdda" cddaSupport)
|
||||
(lib.mesonEnable "dvbin" dvbinSupport)
|
||||
(lib.mesonEnable "dvdnav" dvdnavSupport)
|
||||
(lib.mesonEnable "openal" openalSupport)
|
||||
(lib.mesonEnable "sdl2" sdl2Support)
|
||||
# Disable whilst Swift isn't supported
|
||||
(lib.mesonEnable "swift-build" swiftSupport)
|
||||
(lib.mesonEnable "macos-cocoa-cb" swiftSupport)
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Toggle explicitly because it fails on darwin
|
||||
(lib.mesonEnable "videotoolbox-pl" vulkanSupport)
|
||||
];
|
||||
mesonFlags = [
|
||||
(lib.mesonOption "default_library" "shared")
|
||||
(lib.mesonBool "libmpv" true)
|
||||
(lib.mesonEnable "manpage-build" true)
|
||||
(lib.mesonEnable "cdda" cddaSupport)
|
||||
(lib.mesonEnable "dvbin" dvbinSupport)
|
||||
(lib.mesonEnable "dvdnav" dvdnavSupport)
|
||||
(lib.mesonEnable "openal" openalSupport)
|
||||
(lib.mesonEnable "sdl2" sdl2Support)
|
||||
];
|
||||
|
||||
mesonAutoFeatures = "auto";
|
||||
|
||||
@@ -211,9 +152,9 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
buildPackages.darwin.sigtool
|
||||
xcbuild.xcrun
|
||||
swift
|
||||
makeWrapper
|
||||
]
|
||||
++ lib.optionals swiftSupport [ swift ]
|
||||
++ lib.optionals waylandSupport [ wayland-scanner ];
|
||||
|
||||
buildInputs =
|
||||
@@ -248,16 +189,12 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optionals jackaudioSupport [ libjack2 ]
|
||||
++ lib.optionals javascriptSupport [ mujs ]
|
||||
++ lib.optionals libpngSupport [ libpng ]
|
||||
++ lib.optionals openalSupport [ openalSoft ]
|
||||
++ lib.optionals pipewireSupport [ pipewire ]
|
||||
++ lib.optionals pulseSupport [ libpulseaudio ]
|
||||
++ lib.optionals rubberbandSupport [ rubberband ]
|
||||
++ lib.optionals screenSaverSupport [ libXScrnSaver ]
|
||||
++ lib.optionals sdl2Support [ SDL2 ]
|
||||
++ lib.optionals sixelSupport [ libsixel ]
|
||||
++ lib.optionals speexSupport [ speex ]
|
||||
++ lib.optionals theoraSupport [ libtheora ]
|
||||
++ lib.optionals vaapiSupport [ libva ]
|
||||
++ lib.optionals vapoursynthSupport [ vapoursynth ]
|
||||
++ lib.optionals vdpauSupport [ libvdpau ]
|
||||
@@ -274,29 +211,13 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals x11Support [
|
||||
libX11
|
||||
libXext
|
||||
libGLU
|
||||
libGL
|
||||
libXxf86vm
|
||||
libXrandr
|
||||
libXpresent
|
||||
libXScrnSaver
|
||||
]
|
||||
++ lib.optionals xineramaSupport [ libXinerama ]
|
||||
++ lib.optionals xvSupport [ libXv ]
|
||||
++ lib.optionals zimgSupport [ zimg ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ nv-codec-headers-11 ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
Accelerate
|
||||
CoreFoundation
|
||||
Cocoa
|
||||
CoreAudio
|
||||
MediaPlayer
|
||||
VideoToolbox
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin && swiftSupport) [
|
||||
AVFoundation
|
||||
CoreMedia
|
||||
];
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ nv-codec-headers-11 ];
|
||||
|
||||
postBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
pushd .. # Must be run from the source dir because it uses relative paths
|
||||
@@ -325,6 +246,13 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
cp -r mpv.app $out/Applications
|
||||
|
||||
# On macOS, many things won’t work properly unless `mpv(1)` is
|
||||
# executed from the app bundle, such as spatial audio with
|
||||
# `--ao=avfoundation`. This wrapper ensures that those features
|
||||
# work reliably and also avoids shipping two copies of the entire
|
||||
# `mpv` executable.
|
||||
makeWrapper $out/Applications/mpv.app/Contents/MacOS/mpv $out/bin/mpv
|
||||
'';
|
||||
|
||||
# Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found.
|
||||
|
||||
@@ -171,6 +171,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-error=deprecated-declarations"
|
||||
"-Wno-error=sign-compare" # https://github.com/obsproject/obs-studio/issues/10200
|
||||
"-Wno-error=stringop-overflow="
|
||||
];
|
||||
|
||||
@@ -79,3 +79,19 @@ if [ ! "$havePlatformVersionFlag" ]; then
|
||||
extraBefore+=(-@darwinPlatform@_version_min "${@darwinMinVersionVariable@_@suffixSalt@:-@darwinMinVersion@}")
|
||||
fi
|
||||
fi
|
||||
|
||||
mangleVarSingle DEVELOPER_DIR ${role_suffixes[@]+"${role_suffixes[@]}"}
|
||||
|
||||
# Allow wrapped bintools to do something useful when no `DEVELOPER_DIR` is set, which can happen when
|
||||
# the compiler is run outside of a stdenv or intentionally in an environment with no environment variables set.
|
||||
DEVELOPER_DIR=${DEVELOPER_DIR_@suffixSalt@:-@fallback_sdk@}
|
||||
|
||||
# Darwin looks for frameworks in the SDK located at `DEVELOPER_DIR`.
|
||||
extraBefore+=("-F$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks")
|
||||
extraBefore+=("-L$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib")
|
||||
|
||||
# While the Swift wrapper should take care of this, anything that needs to link Swift auto-linked frameworks
|
||||
# also needs these paths. Note: Test and conditionally add it because the path may not exist in older SDKs.
|
||||
if [ -d "$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/swift" ]; then
|
||||
extraBefore+=("-L$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/swift")
|
||||
fi
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
, stdenvNoCC
|
||||
, runtimeShell
|
||||
, bintools ? null, libc ? null, coreutils ? null, gnugrep ? null
|
||||
, apple-sdk ? null
|
||||
, netbsd ? null
|
||||
, sharedLibraryLoader ?
|
||||
if libc == null then
|
||||
@@ -106,7 +107,8 @@ let
|
||||
coreutils_bin = optionalString (!nativeTools) (getBin coreutils);
|
||||
|
||||
# See description in cc-wrapper.
|
||||
suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config;
|
||||
suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config
|
||||
+ lib.optionalString (targetPlatform.isDarwin && targetPlatform.isStatic) "_static";
|
||||
|
||||
# The dynamic linker has different names on different platforms. This is a
|
||||
# shell glob that ought to match it.
|
||||
@@ -405,6 +407,9 @@ stdenvNoCC.mkDerivation {
|
||||
inherit dynamicLinker targetPrefix suffixSalt coreutils_bin;
|
||||
inherit bintools_bin libc_bin libc_dev libc_lib;
|
||||
default_hardening_flags_str = builtins.toString defaultHardeningFlags;
|
||||
} // lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) {
|
||||
# Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.
|
||||
fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;
|
||||
};
|
||||
|
||||
meta =
|
||||
|
||||
@@ -78,12 +78,28 @@ if [ -e @out@/nix-support/cc-cflags-before ]; then
|
||||
NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@="$(< @out@/nix-support/cc-cflags-before) $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@"
|
||||
fi
|
||||
|
||||
# Only add darwin min version flag if a default darwin min version is set,
|
||||
# Only add darwin min version flag and set up `DEVELOPER_DIR` if a default darwin min version is set,
|
||||
# which is a signal that we're targetting darwin.
|
||||
if [ "@darwinMinVersion@" ]; then
|
||||
mangleVarSingle @darwinMinVersionVariable@ ${role_suffixes[@]+"${role_suffixes[@]}"}
|
||||
|
||||
NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@="-m@darwinPlatformForCC@-version-min=${@darwinMinVersionVariable@_@suffixSalt@:-@darwinMinVersion@} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@"
|
||||
|
||||
# `DEVELOPER_DIR` is used to dynamically locate libSystem (and the SDK frameworks) based on the SDK at that path.
|
||||
mangleVarSingle DEVELOPER_DIR ${role_suffixes[@]+"${role_suffixes[@]}"}
|
||||
|
||||
# Allow wrapped compilers to do something useful when no `DEVELOPER_DIR` is set, which can happen when
|
||||
# the compiler is run outside of a stdenv or intentionally in an environment with no environment variables set.
|
||||
DEVELOPER_DIR=${DEVELOPER_DIR_@suffixSalt@:-@fallback_sdk@}
|
||||
|
||||
# xcbuild needs `SDKROOT` to be the name of the SDK, which it sets in its own wrapper,
|
||||
# but compilers expect it to point to the absolute path.
|
||||
SDKROOT="$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
|
||||
|
||||
# Set up various library paths since compilers may not support (or may have disabled) finding them in the sysroot.
|
||||
NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@+=" -isysroot $SDKROOT"
|
||||
NIX_CFLAGS_COMPILE_@suffixSalt@+=" -idirafter $SDKROOT/usr/include"
|
||||
NIX_CFLAGS_COMPILE_@suffixSalt@+=" -iframework $SDKROOT/System/Library/Frameworks"
|
||||
fi
|
||||
|
||||
# That way forked processes will not extend these environment variables again.
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
, stdenvNoCC
|
||||
, runtimeShell
|
||||
, cc ? null, libc ? null, bintools, coreutils ? null
|
||||
, apple-sdk ? null
|
||||
, zlib ? null
|
||||
, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
|
||||
, propagateDoc ? cc != null && cc ? man
|
||||
@@ -114,7 +115,8 @@ let
|
||||
# without interfering. For the moment, it is defined as the target triple,
|
||||
# adjusted to be a valid bash identifier. This should be considered an
|
||||
# unstable implementation detail, however.
|
||||
suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config;
|
||||
suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config
|
||||
+ lib.optionalString (targetPlatform.isDarwin && targetPlatform.isStatic) "_static";
|
||||
|
||||
useGccForLibs = useCcForLibs
|
||||
&& libcxx == null
|
||||
@@ -737,7 +739,7 @@ stdenvNoCC.mkDerivation {
|
||||
|
||||
# for substitution in utils.bash
|
||||
# TODO(@sternenseemann): invent something cleaner than passing in "" in case of absence
|
||||
expandResponseParams = "${expand-response-params}/bin/expand-response-params";
|
||||
expandResponseParams = lib.optionalString (expand-response-params != "") (lib.getExe expand-response-params);
|
||||
# TODO(@sternenseemann): rename env var via stdenv rebuild
|
||||
shell = getBin runtimeShell + runtimeShell.shellPath or "";
|
||||
gnugrep_bin = optionalString (!nativeTools) gnugrep;
|
||||
@@ -749,6 +751,9 @@ stdenvNoCC.mkDerivation {
|
||||
inherit libc_bin libc_dev libc_lib;
|
||||
inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable;
|
||||
default_hardening_flags_str = builtins.toString defaultHardeningFlags;
|
||||
} // lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) {
|
||||
# Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.
|
||||
fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;
|
||||
};
|
||||
|
||||
meta =
|
||||
|
||||
@@ -31,7 +31,7 @@ substituteAll {
|
||||
then "GNU/Linux"
|
||||
else if forPlatform.isDarwin
|
||||
then "Darwin" # darwin isn't in host-os.m4 so where does this come from?
|
||||
else if stdenv.buildPlatform.isFreeBSD
|
||||
else if forPlatform.isFreeBSD
|
||||
then "FreeBSD"
|
||||
else "unknown";
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ let
|
||||
# compression type and filename extension.
|
||||
compressorName = fullCommand: builtins.elemAt (builtins.match "([^ ]*/)?([^ ]+).*" fullCommand) 1;
|
||||
in
|
||||
{ stdenvNoCC, libarchive, ubootTools, lib, pkgsBuildHost, makeInitrdNGTool, binutils, runCommand
|
||||
{ stdenvNoCC, cpio, ubootTools, lib, pkgsBuildHost, makeInitrdNGTool, binutils, runCommand
|
||||
# Name of the derivation (not of the resulting file!)
|
||||
, name ? "initrd"
|
||||
|
||||
@@ -74,7 +74,7 @@ in
|
||||
passAsFile = ["contents"];
|
||||
contents = builtins.toJSON contents;
|
||||
|
||||
nativeBuildInputs = [makeInitrdNGTool libarchive] ++ lib.optional makeUInitrd ubootTools ++ lib.optional strip binutils;
|
||||
nativeBuildInputs = [makeInitrdNGTool cpio] ++ lib.optional makeUInitrd ubootTools ++ lib.optional strip binutils;
|
||||
|
||||
STRIP = if strip then "${pkgsBuildHost.binutils.targetPrefix}strip" else null;
|
||||
}) ''
|
||||
@@ -85,7 +85,7 @@ in
|
||||
for PREP in $prepend; do
|
||||
cat $PREP >> $out/initrd
|
||||
done
|
||||
(cd root && find . -print0 | sort -z | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @- | eval -- $compress >> "$out/initrd")
|
||||
(cd root && find . -print0 | sort -z | cpio --quiet -o -H newc -R +0:+0 --reproducible --null | eval -- $compress >> "$out/initrd")
|
||||
|
||||
if [ -n "$makeUInitrd" ]; then
|
||||
mkimage -A "$uInitrdArch" -O linux -T ramdisk -C "$uInitrdCompression" -d "$out/initrd" $out/initrd.img
|
||||
|
||||
@@ -18,7 +18,7 @@ let
|
||||
# compression type and filename extension.
|
||||
compressorName = fullCommand: builtins.elemAt (builtins.match "([^ ]*/)?([^ ]+).*" fullCommand) 1;
|
||||
in
|
||||
{ stdenvNoCC, perl, libarchive, ubootTools, lib, pkgsBuildHost
|
||||
{ stdenvNoCC, perl, cpio, ubootTools, lib, pkgsBuildHost
|
||||
# Name of the derivation (not of the resulting file!)
|
||||
, name ? "initrd"
|
||||
|
||||
@@ -80,7 +80,7 @@ in stdenvNoCC.mkDerivation (rec {
|
||||
|
||||
builder = ./make-initrd.sh;
|
||||
|
||||
nativeBuildInputs = [ perl libarchive ]
|
||||
nativeBuildInputs = [ perl cpio ]
|
||||
++ lib.optional makeUInitrd ubootTools;
|
||||
|
||||
compress = "${_compressorExecutable} ${lib.escapeShellArgs _compressorArgsReal}";
|
||||
|
||||
@@ -40,7 +40,7 @@ for PREP in $prepend; do
|
||||
cat $PREP >> $out/initrd
|
||||
done
|
||||
(cd root && find * .[^.*] -exec touch -h -d '@1' '{}' +)
|
||||
(cd root && find * .[^.*] -print0 | sort -z | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @- | eval -- $compress >> "$out/initrd")
|
||||
(cd root && find * .[^.*] -print0 | sort -z | cpio --quiet -o -H newc -R +0:+0 --reproducible --null | eval -- $compress >> "$out/initrd")
|
||||
|
||||
if [ -n "$makeUInitrd" ]; then
|
||||
mkimage -A "$uInitrdArch" -O linux -T ramdisk -C "$uInitrdCompression" -d "$out/initrd" $out/initrd.img
|
||||
|
||||
@@ -41,10 +41,10 @@ else stdenv.mkDerivation rec {
|
||||
# like arm64(e).
|
||||
PATH=${bintools-unwrapped}/bin:${llvmPackages.clang-unwrapped}/bin:$PATH \
|
||||
clang -arch x86_64 -arch arm64 -arch arm64e \
|
||||
-isystem ${llvmPackages.clang.libc}/include \
|
||||
-isystem "$SDKROOT/usr/include" \
|
||||
-isystem ${llvmPackages.libclang.lib}/lib/clang/*/include \
|
||||
-L${llvmPackages.clang.libc}/lib \
|
||||
-Wl,-install_name,$libName \
|
||||
"-L$SDKROOT/usr/lib" \
|
||||
-Wl,-install_name,$out/lib/$libName \
|
||||
-Wall -std=c99 -O3 -fPIC libredirect.c \
|
||||
-shared -o "$libName"
|
||||
'' else if stdenv.hostPlatform.isDarwin then ''
|
||||
|
||||
@@ -38,7 +38,7 @@ cargoCheckHook() {
|
||||
concatTo flagsArray cargoTestFlags checkFlags checkFlagsArray
|
||||
|
||||
echoCmd 'cargoCheckHook flags' "${flagsArray[@]}"
|
||||
cargo test "${flagsArray[@]}"
|
||||
@setEnv@ cargo test "${flagsArray[@]}"
|
||||
|
||||
if [[ -n "${buildAndTestSubdir-}" ]]; then
|
||||
popd
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
name = "cargo-check-hook.sh";
|
||||
propagatedBuildInputs = [ cargo ];
|
||||
substitutions = {
|
||||
inherit (rust.envVars) rustHostPlatformSpec;
|
||||
inherit (rust.envVars) rustHostPlatformSpec setEnv;
|
||||
};
|
||||
} ./cargo-check-hook.sh) {};
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ autoPatchelf() {
|
||||
fi
|
||||
done
|
||||
|
||||
@pythonInterpreter@ @autoPatchelfScript@ \
|
||||
auto-patchelf \
|
||||
${norecurse:+--no-recurse} \
|
||||
--ignore-missing "${ignoreMissingDepsArray[@]}" \
|
||||
--paths "$@" \
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
{ makeSetupHook }:
|
||||
makeSetupHook { name = "flatten-include-hack-hook"; } ./flatten-include-hack-hook.sh
|
||||
@@ -0,0 +1,16 @@
|
||||
# shellcheck shell=bash
|
||||
|
||||
# This is a horrible hack. You should not use this.
|
||||
|
||||
flattenIncludes() {
|
||||
(
|
||||
cd "${!outputInclude}/include" || exit
|
||||
for file in */*; do
|
||||
target=$(basename "$file")
|
||||
echo "[HACK] Symlinking include $file to flattened path $target..."
|
||||
ln -s "$file" "$target"
|
||||
done
|
||||
)
|
||||
}
|
||||
|
||||
preFixupHooks+=(flattenIncludes)
|
||||
@@ -1,22 +1,64 @@
|
||||
{ stdenv }:
|
||||
# srcOnly is a utility builder that only fetches and unpacks the given `src`,
|
||||
# and optionally patching with `patches` or adding build inputs.
|
||||
#
|
||||
# It can be invoked directly, or be used to wrap an existing derivation. Eg:
|
||||
#
|
||||
# > srcOnly pkgs.hello
|
||||
#
|
||||
{ lib, stdenvNoCC }:
|
||||
|
||||
/**
|
||||
A utility builder to get the source code of the input derivation, with any patches applied.
|
||||
|
||||
# Examples
|
||||
|
||||
```nix
|
||||
srcOnly pkgs.hello
|
||||
=> «derivation /nix/store/gyfk2jg9079ga5g5gfms5i4h0k9jhf0f-hello-2.12.1-source.drv»
|
||||
|
||||
srcOnly {
|
||||
inherit (pkgs.hello) name version src stdenv;
|
||||
}
|
||||
=> «derivation /nix/store/vf9hdhz38z7rfhzhrk0vi70h755fnsw7-hello-2.12.1-source.drv»
|
||||
```
|
||||
|
||||
# Type
|
||||
|
||||
```
|
||||
srcOnly :: (Derivation | AttrSet) -> Derivation
|
||||
```
|
||||
|
||||
# Input
|
||||
|
||||
`attrs`
|
||||
|
||||
: One of the following:
|
||||
|
||||
- A derivation with (at minimum) an unpackPhase and a patchPhase.
|
||||
- A set of attributes that would be passed to a `stdenv.mkDerivation` or `stdenvNoCC.mkDerivation` call.
|
||||
|
||||
# Output
|
||||
|
||||
A derivation that runs a derivation's `unpackPhase` and `patchPhase`, and then copies the result to the output path.
|
||||
*/
|
||||
|
||||
attrs:
|
||||
let
|
||||
args = if builtins.hasAttr "drvAttrs" attrs then attrs.drvAttrs else attrs;
|
||||
name = if builtins.hasAttr "name" args then args.name else "${args.pname}-${args.version}";
|
||||
args = attrs.drvAttrs or attrs;
|
||||
name = args.name or "${args.pname}-${args.version}";
|
||||
stdenv = args.stdenv or (lib.warn "srcOnly: stdenv not provided, using stdenvNoCC" stdenvNoCC);
|
||||
drv = stdenv.mkDerivation (
|
||||
args
|
||||
// {
|
||||
name = "${name}-source";
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
phases = [
|
||||
"unpackPhase"
|
||||
"patchPhase"
|
||||
"installPhase"
|
||||
];
|
||||
separateDebugInfo = false;
|
||||
|
||||
dontUnpack = false;
|
||||
|
||||
dontInstall = false;
|
||||
installPhase = "cp -pr --reflink=auto -- . $out";
|
||||
}
|
||||
);
|
||||
in
|
||||
stdenv.mkDerivation (args // {
|
||||
name = "${name}-source";
|
||||
installPhase = "cp -pr --reflink=auto -- . $out";
|
||||
outputs = [ "out" ];
|
||||
separateDebugInfo = false;
|
||||
dontUnpack = false;
|
||||
dontInstall = false;
|
||||
phases = ["unpackPhase" "patchPhase" "installPhase"];
|
||||
})
|
||||
lib.warnIf (args.dontUnpack or false) "srcOnly: derivation has dontUnpack set, overriding" drv
|
||||
|
||||
@@ -1,44 +1,44 @@
|
||||
{ lib
|
||||
, fetchurl
|
||||
, desktop-file-utils
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gnome
|
||||
, gtk3
|
||||
, wrapGAppsHook3
|
||||
, gobject-introspection
|
||||
, itstool
|
||||
, libxml2
|
||||
, python3
|
||||
, at-spi2-core
|
||||
, dbus
|
||||
, gettext
|
||||
, libwnck
|
||||
, adwaita-icon-theme
|
||||
, librsvg
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "accerciser";
|
||||
version = "3.42.0";
|
||||
version = "3.44.1";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-d2m9T09j3ImhQ+hs3ET+rr1/jJab6lwfWoaskxGQL0g=";
|
||||
hash = "sha256-tJz7DTIY+/Vf+kPH96N9a4URn+2VahBjCYBO2+mDkAM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
gettext
|
||||
gobject-introspection # For setup hook
|
||||
itstool
|
||||
libxml2
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
dbus
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
adwaita-icon-theme
|
||||
at-spi2-core
|
||||
gtk3
|
||||
libwnck
|
||||
@@ -46,11 +46,13 @@ python3.pkgs.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
dbus-python
|
||||
ipython
|
||||
pyatspi
|
||||
pycairo
|
||||
pygobject3
|
||||
setuptools
|
||||
pyxdg
|
||||
setuptools # for pkg_resources
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
@@ -1,21 +1,22 @@
|
||||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, meson
|
||||
, ninja
|
||||
, sassc
|
||||
{
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
meson,
|
||||
ninja,
|
||||
sassc,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "adw-gtk3";
|
||||
version = "5.3";
|
||||
version = "5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lassekongo83";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DpJLX9PJX1Q8dDOx7YOXQzgNECsKp5uGiCVTX6iSlbI=";
|
||||
repo = "adw-gtk3";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-WW6lJmGNn+e0jXu319SSX6e6POWfdgsIeg/U1vmwy1U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -33,11 +34,11 @@ stdenvNoCC.mkDerivation rec {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Theme from libadwaita ported to GTK-3";
|
||||
homepage = "https://github.com/lassekongo83/adw-gtk3";
|
||||
license = licenses.lgpl21Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ciferkey ];
|
||||
license = lib.licenses.lgpl21Only;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ ciferkey ];
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adwaita-icon-theme";
|
||||
version = "46.0";
|
||||
version = "47.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/adwaita-icon-theme-${version}.tar.xz";
|
||||
hash = "sha256-S8tTm9ddZNo4XW+gjLqp3erOtqyOgrhbpsQRF79bpk4=";
|
||||
hash = "sha256-rQiKIpWMuEaeQdnxu6Dvsn5YaiECITzYnMJtsuACvf4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -37,6 +37,13 @@ stdenv.mkDerivation rec {
|
||||
hicolor-icon-theme
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Postpone these changes for now, please discuss in https://github.com/NixOS/nixpkgs/pull/316416
|
||||
substituteInPlace index.theme \
|
||||
--replace-fail "Hidden=true" "" \
|
||||
--replace-fail "Inherits=AdwaitaLegacy,hicolor" "Inherits=hicolor"
|
||||
'';
|
||||
|
||||
dontDropIconThemeCache = true;
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -1,29 +1,19 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch }:
|
||||
{
|
||||
directoryListingUpdater,
|
||||
fetchurl,
|
||||
lib,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alsa-ucm-conf";
|
||||
version = "1.2.11";
|
||||
version = "1.2.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://alsa/lib/alsa-ucm-conf-${version}.tar.bz2";
|
||||
hash = "sha256-OHwBzzDioWdte49ysmgc8hmrynDdHsKp4zrdW/P+roE=";
|
||||
hash = "sha256-Fo58BUm3v4mRCS+iv7kDYx33edxMQ+6PQnf8t3LYwDU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# TODO: Remove this patch in the next package upgrade
|
||||
name = "rt1318-fix-one.patch";
|
||||
url = "https://github.com/alsa-project/alsa-ucm-conf/commit/7e22b7c214d346bd156131f3e6c6a5900bbf116d.patch";
|
||||
hash = "sha256-5X0ANXTSRnC9jkvMLl7lA5TBV3d1nwWE57DP6TwliII=";
|
||||
})
|
||||
(fetchpatch {
|
||||
# TODO: Remove this patch in the next package upgrade
|
||||
name = "rt1318-fix-two.patch";
|
||||
url = "https://github.com/alsa-project/alsa-ucm-conf/commit/4e0fcc79b7d517a957e12f02ecae5f3c69fa94dc.patch";
|
||||
hash = "sha256-cuZPEEqb8+d1Ak2tA+LVEh6gtGt1X+LiAnfFYMIDCXY=";
|
||||
})
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
@@ -35,6 +25,10 @@ stdenv.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = directoryListingUpdater {
|
||||
url = "https://www.alsa-project.org/files/pub/lib/";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.alsa-project.org/";
|
||||
description = "ALSA Use Case Manager configuration";
|
||||
|
||||
@@ -28,7 +28,7 @@ let
|
||||
# ÁNYK needs JavaFX for the Ügyfélkapu login webview.
|
||||
jdkWithFX = openjdk.override {
|
||||
enableJavaFX = true;
|
||||
openjfx = openjfx.override { withWebKit = true; };
|
||||
openjfx_jdk = openjfx.override { withWebKit = true; };
|
||||
};
|
||||
|
||||
extraClasspath = [
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
stdenvNoCC,
|
||||
}:
|
||||
|
||||
let
|
||||
CoreSymbolication = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "CoreSymbolication";
|
||||
version = "0-unstable-2018-06-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "CoreSymbolication";
|
||||
owner = "matthewbauer";
|
||||
rev = "24c87c23664b3ee05dc7a5a87d647ae476a680e4";
|
||||
hash = "sha256-PzvLq94eNhP0+rLwGMKcMzxuD6MlrNI7iT/eV0obtSE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Add missing symbol definitions needed to build `zlog` in system_cmds.
|
||||
# https://github.com/matthewbauer/CoreSymbolication/pull/2
|
||||
../patches/0001-Add-function-definitions-needed-to-build-zlog-in-sys.patch
|
||||
../patches/0002-Add-CF_EXPORT-To-const-symbols.patch
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/include"
|
||||
cp *.h "$out/include"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Reverse engineered headers for Apple's CoreSymbolication framework";
|
||||
homepage = "https://github.com/matthewbauer/CoreSymbolication";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = lib.teams.darwin.members;
|
||||
platforms = lib.platforms.darwin;
|
||||
};
|
||||
});
|
||||
in
|
||||
self: super: {
|
||||
buildPhase =
|
||||
super.buildPhase or ""
|
||||
+ ''
|
||||
mkdir -p System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/Headers
|
||||
ln -s A System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/Current
|
||||
ln -s Versions/Current/Headers System/Library/PrivateFrameworks/CoreSymbolication.framework/Headers
|
||||
cp '${CoreSymbolication}/include/'*.h System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/Headers
|
||||
'';
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
{ lib, config }:
|
||||
|
||||
self: super: {
|
||||
preBuild =
|
||||
super.preBuild or ""
|
||||
+ ''
|
||||
platformPath=$out/Platforms/MacOSX.platform
|
||||
sdkpath=$platformPath/Developer/SDKs
|
||||
'';
|
||||
|
||||
preInstall =
|
||||
super.preInstall or ""
|
||||
+ ''
|
||||
platformPath=$out/Platforms/MacOSX.platform
|
||||
sdkpath=$platformPath/Developer/SDKs
|
||||
'';
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
fetchurl,
|
||||
cpio,
|
||||
pbzx,
|
||||
}:
|
||||
|
||||
{
|
||||
url,
|
||||
version,
|
||||
hash,
|
||||
}:
|
||||
|
||||
fetchurl {
|
||||
pname = "macOS-SDK";
|
||||
inherit version url hash;
|
||||
|
||||
recursiveHash = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cpio
|
||||
pbzx
|
||||
];
|
||||
|
||||
postFetch = ''
|
||||
renamed=$(mktemp -d)/sdk.xar
|
||||
mv "$downloadedFile" "$renamed"
|
||||
pbzx "$renamed" | cpio -idm
|
||||
|
||||
# SDKs are inconsistent about whether MacOSX.sdk or MacOSX<version>.sdk is a symlink.
|
||||
src=Library/Developer/CommandLineTools/SDKs/MacOSX${lib.versions.majorMinor version}.sdk
|
||||
if [ ! -d $src ]; then
|
||||
src=Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
|
||||
fi
|
||||
|
||||
# Remove unwanted binaries, man pages, and folders from the SDK.
|
||||
rm -rf $src/usr/bin $src/usr/share $src/System/Library/Perl
|
||||
|
||||
mkdir -p "$out"
|
||||
cp -rd $src/* "$out"
|
||||
'';
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
{ makeSetupHook, sdkVersion }:
|
||||
|
||||
self: super: {
|
||||
passthru = super.passthru or { } // {
|
||||
privateFrameworksHook = makeSetupHook {
|
||||
name = "apple-sdk-private-frameworks-hook";
|
||||
} ../setup-hooks/add-private-frameworks.sh;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
let
|
||||
lockfile = builtins.fromJSON (builtins.readFile ../metadata/apple-oss-lockfile.json);
|
||||
in
|
||||
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
stdenvNoCC,
|
||||
sdkVersion,
|
||||
}:
|
||||
|
||||
let
|
||||
sdkinfo = lockfile.${sdkVersion};
|
||||
in
|
||||
self: super: {
|
||||
passthru = super.passthru or { } // {
|
||||
# Returns the raw source from apple-oss-distributions repo.
|
||||
# This is mostly useful for copying private headers needed to build other source releases.
|
||||
#
|
||||
# Note: The source releases are mostly not used to build the SDK. Unless they can be used to build binaries,
|
||||
# they’re not used.
|
||||
sourceRelease =
|
||||
name:
|
||||
let
|
||||
lockinfo = sdkinfo.${name};
|
||||
in
|
||||
fetchFromGitHub {
|
||||
owner = "apple-oss-distributions";
|
||||
repo = name;
|
||||
rev = lockinfo.rev or "${name}-${lockinfo.version}";
|
||||
inherit (lockinfo) hash;
|
||||
}
|
||||
// {
|
||||
inherit (lockinfo) version;
|
||||
};
|
||||
};
|
||||
}
|
||||
+33
-27
@@ -1,7 +1,10 @@
|
||||
{ stdenv, runCommand, lib, sdks, xcodePlatform, writeText }:
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
xcodePlatform,
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
inherit (lib.generators) toPlist;
|
||||
|
||||
Info = {
|
||||
@@ -10,11 +13,7 @@ let
|
||||
Name = lib.toLower xcodePlatform;
|
||||
};
|
||||
|
||||
Version = {
|
||||
ProjectName = "OSXPlatformSupport";
|
||||
};
|
||||
|
||||
# These files are all based off of Xcode spec fies found in
|
||||
# These files are all based off of Xcode spec files found in
|
||||
# /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/Xcode/PrivatePlugIns/IDEOSXSupportCore.ideplugin/Contents/Resources.
|
||||
|
||||
# Based off of the "MacOSX Architectures.xcspec" file. All i386 stuff
|
||||
@@ -24,14 +23,20 @@ let
|
||||
Identifier = "Standard";
|
||||
Type = "Architecture";
|
||||
Name = "Standard Architectures (Apple Silicon, 64-bit Intel)";
|
||||
RealArchitectures = [ "arm64" "x86_64" ];
|
||||
RealArchitectures = [
|
||||
"arm64"
|
||||
"x86_64"
|
||||
];
|
||||
ArchitectureSetting = "ARCHS_STANDARD";
|
||||
}
|
||||
{
|
||||
Identifier = "Universal";
|
||||
Type = "Architecture";
|
||||
Name = "Universal (Apple Silicon, 64-bit Intel)";
|
||||
RealArchitectures = [ "arm64" "x86_64" ];
|
||||
RealArchitectures = [
|
||||
"arm64"
|
||||
"x86_64"
|
||||
];
|
||||
ArchitectureSetting = "ARCHS_STANDARD_32_64_BIT";
|
||||
}
|
||||
{
|
||||
@@ -44,11 +49,14 @@ let
|
||||
Identifier = "Standard64bit";
|
||||
Type = "Architecture";
|
||||
Name = "Apple Silicon, 64-bit Intel";
|
||||
RealArchitectures = [ "arm64" "x86_64" ];
|
||||
RealArchitectures = [
|
||||
"arm64"
|
||||
"x86_64"
|
||||
];
|
||||
ArchitectureSetting = "ARCHS_STANDARD_64_BIT";
|
||||
}
|
||||
{
|
||||
Identifier = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64";
|
||||
Identifier = stdenvNoCC.hostPlatform.darwinArch;
|
||||
Type = "Architecture";
|
||||
Name = "Apple Silicon or Intel 64-bit";
|
||||
}
|
||||
@@ -56,7 +64,10 @@ let
|
||||
Identifier = "Standard_Including_64_bit";
|
||||
Type = "Architecture";
|
||||
Name = "Standard Architectures (including 64-bit)";
|
||||
RealArchitectures = [ "arm64" "x86_64" ];
|
||||
RealArchitectures = [
|
||||
"arm64"
|
||||
"x86_64"
|
||||
];
|
||||
ArchitectureSetting = "ARCHS_STANDARD_INCLUDING_64_BIT";
|
||||
}
|
||||
];
|
||||
@@ -283,19 +294,14 @@ let
|
||||
}
|
||||
];
|
||||
|
||||
ToolchainInfo = {
|
||||
Identifier = "com.apple.dt.toolchain.XcodeDefault";
|
||||
};
|
||||
in
|
||||
|
||||
runCommand "Platforms" {} ''
|
||||
platform=$out/${xcodePlatform}.platform
|
||||
|
||||
install -D ${writeText "Info.plist" (toPlist {} Info)} $platform/Info.plist
|
||||
install -D ${writeText "version.plist" (toPlist {} Version)} $platform/version.plist
|
||||
install -D ${writeText "Architectures.xcspec" (toPlist {} Architectures)} $platform/Developer/Library/Xcode/Specifications/Architectures.xcspec
|
||||
install -D ${writeText "PackageTypes.xcspec" (toPlist {} PackageTypes)} $platform/Developer/Library/Xcode/Specifications/PackageTypes.xcspec
|
||||
install -D ${writeText "ProductTypes.xcspec" (toPlist {} ProductTypes)} $platform/Developer/Library/Xcode/Specifications/ProductTypes.xcspec
|
||||
|
||||
ln -s $platform $platform/usr
|
||||
|
||||
mkdir -p $platform/Developer
|
||||
ln -s ${sdks} $platform/Developer/SDKs
|
||||
''
|
||||
{
|
||||
"Info.plist" = builtins.toFile "Info.plist" (toPlist { } Info);
|
||||
"ToolchainInfo.plist" = builtins.toFile "ToolchainInfo.plist" (toPlist { } ToolchainInfo);
|
||||
"Architectures.xcspec" = builtins.toFile "Architectures.xcspec" (toPlist { } Architectures);
|
||||
"PackageTypes.xcspec" = builtins.toFile "PackageTypes.xcspec" (toPlist { } PackageTypes);
|
||||
"ProductTypes.xcspec" = builtins.toFile "ProductTypes.xcspec" (toPlist { } ProductTypes);
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
let
|
||||
removedDylibs = [
|
||||
# corecrypto is available under a very restrictive license (effectively: non-free, can’t use).
|
||||
# Without the headers and not being able to use corecrypto due to its license, it’s not very useful.
|
||||
# Stubs are included in the SDK for all dylibs, including corecrypto. They should be removed.
|
||||
"/usr/lib/system/libcorecrypto.dylib"
|
||||
];
|
||||
in
|
||||
|
||||
{
|
||||
lib,
|
||||
jq,
|
||||
libtapi,
|
||||
}:
|
||||
|
||||
self: super: {
|
||||
nativeBuildInputs = super.nativeBuildInputs or [ ] ++ [
|
||||
jq
|
||||
libtapi
|
||||
];
|
||||
|
||||
buildPhase =
|
||||
super.buildPhase or ""
|
||||
+ ''
|
||||
echo "Removing the following dylibs from the libSystem reexported libraries list: ${lib.escapeShellArg (lib.concatStringsSep ", " removedDylibs)}"
|
||||
for libSystem in libSystem.B.tbd libSystem.B_asan.tbd; do
|
||||
test ! -e usr/lib/$libSystem && continue # TODO: remove once the minimum SDK is 10.14 or newer.
|
||||
tapi stubify --filetype=tbd-v5 usr/lib/$libSystem -o usr/lib/$libSystem # tbd-v5 is a JSON-based format.
|
||||
jq --argjson libs ${lib.escapeShellArg (builtins.toJSON removedDylibs)} '
|
||||
if .libraries then
|
||||
.libraries[] |= select(.install_names[] | any([.] | inside($libs)) | not)
|
||||
else
|
||||
.
|
||||
end
|
||||
| .main_library.reexported_libraries[].names[] |= select([.] | inside($libs) | not)
|
||||
' usr/lib/$libSystem > usr/lib/$libSystem~
|
||||
mv usr/lib/$libSystem~ usr/lib/$libSystem
|
||||
done
|
||||
|
||||
# Rewrite the text-based stubs to v4 using `tapi`. This ensures a consistent format between SDK versions.
|
||||
# tbd-v4 also drops certain elements that are no longer necessary (such as GUID lists).
|
||||
find . -name '*.tbd' -type f \
|
||||
-exec echo "Converting {} to tbd-v4" \; \
|
||||
-exec tapi stubify --filetype=tbd-v4 {} -o {} \;
|
||||
'';
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
{
|
||||
lib,
|
||||
cups,
|
||||
darwin,
|
||||
db,
|
||||
libiconv,
|
||||
ncurses,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
xcbuild,
|
||||
}:
|
||||
|
||||
let
|
||||
# CUPS has too many dependencies to build as part of the Darwin bootstrap. It’s also typically taken as an explicit
|
||||
# dependency by other packages, so building only the headers (to satisfy other SDK headers) should be okay.
|
||||
cupsHeaders = darwin.bootstrapStdenv.mkDerivation {
|
||||
pname = "${lib.getName cups}-headers";
|
||||
version = lib.getVersion cups;
|
||||
|
||||
inherit (cups) src;
|
||||
|
||||
patches = cups.patches or [ ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
buildInputs = [ darwin.libresolv ]; # The `configure` script requires libresolv headers.
|
||||
|
||||
# CUPS’s configure script fails to find `ar` when cross-compiling.
|
||||
configureFlags = [ "ac_cv_path_AR=${stdenv.cc.targetPrefix}ar" ];
|
||||
|
||||
installTargets = [ "install-headers" ];
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
inherit (cups.meta)
|
||||
homepage
|
||||
description
|
||||
license
|
||||
maintainers
|
||||
platforms
|
||||
;
|
||||
};
|
||||
};
|
||||
in
|
||||
self: super: {
|
||||
# These packages are propagated only because other platforms include them in their libc (or otherwise by default).
|
||||
# Reducing the number of special cases required to support Darwin makes supporting it easier for package authors.
|
||||
propagatedBuildInputs =
|
||||
super.propagatedBuildInputs or [ ]
|
||||
++ [
|
||||
libiconv
|
||||
darwin.libresolv
|
||||
darwin.libsbuf
|
||||
# Required by some SDK headers
|
||||
cupsHeaders
|
||||
]
|
||||
# x86_64-darwin links the object files from Csu when targeting very old releases
|
||||
++ lib.optionals stdenvNoCC.hostPlatform.isx86_64 [ darwin.Csu ];
|
||||
|
||||
# The Darwin module for Swift requires certain headers to be included in the SDK (and not just be propagated).
|
||||
buildPhase =
|
||||
super.buildPhase or ""
|
||||
+ ''
|
||||
for header in '${lib.getDev libiconv}/include/'* '${lib.getDev ncurses}/include/'*; do
|
||||
ln -s "$header" "usr/include/$(basename "$header")"
|
||||
done
|
||||
'';
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
pkgsBuildHost,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
}:
|
||||
|
||||
let
|
||||
plists = import ./plists.nix {
|
||||
inherit lib stdenvNoCC;
|
||||
xcodePlatform = if stdenvNoCC.hostPlatform.isMacOS then "MacOSX" else "iPhoneOS";
|
||||
};
|
||||
inherit (pkgsBuildHost) darwin cctools xcbuild;
|
||||
in
|
||||
self: super: {
|
||||
propagatedNativeBuildInputs = super.propagatedNativeBuildInputs or [ ] ++ [ xcbuild.xcrun ];
|
||||
|
||||
postInstall =
|
||||
super.postInstall or ""
|
||||
+ ''
|
||||
specspath=$out/Library/Xcode/Specifications
|
||||
toolchainsPath=$out/Toolchains/XcodeDefault.xctoolchain
|
||||
mkdir -p "$specspath" "$toolchainsPath"
|
||||
|
||||
# xcbuild expects to find things relative to the plist locations. If these are linked instead of copied,
|
||||
# it won’t find any platforms or SDKs.
|
||||
cp '${plists."Info.plist"}' "$platformPath/Info.plist"
|
||||
cp '${plists."ToolchainInfo.plist"}' "$toolchainsPath/ToolchainInfo.plist"
|
||||
|
||||
for spec in '${xcbuild}/Library/Xcode/Specifications/'*; do
|
||||
ln -s "$spec" "$specspath/$(basename "$spec")"
|
||||
done
|
||||
cp '${plists."Architectures.xcspec"}' "$specspath/Architectures.xcspec"
|
||||
cp '${plists."PackageTypes.xcspec"}' "$specspath/PackageTypes.xcspec"
|
||||
cp '${plists."ProductTypes.xcspec"}' "$specspath/ProductTypes.xcspec"
|
||||
|
||||
mkdir -p "$out/usr/bin"
|
||||
ln -s '${xcbuild.xcrun}/bin/xcrun' "$out/usr/bin/xcrun"
|
||||
|
||||
# Include `libtool` in the toolchain, so `xcrun -find libtool` can find it without requiring `cctools.libtool`
|
||||
# as a `nativeBuildInput`.
|
||||
mkdir -p "$toolchainsPath/usr/bin"
|
||||
ln -s '${cctools.libtool}/bin/${stdenv.cc.targetPrefix}libtool' "$toolchainsPath/usr/bin/libtool"
|
||||
|
||||
# Include additional binutils required by some packages (such as Chromium).
|
||||
for tool in lipo nm otool size strip; do
|
||||
ln -s '${darwin.binutils-unwrapped}/bin/${stdenv.cc.targetPrefix}'$tool "$toolchainsPath/usr/bin/$tool"
|
||||
done
|
||||
'';
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
let
|
||||
# This can be made unconditional once jq is available in the bootstrap tools. If corecrypto is not removed from
|
||||
# the umbrella framework, linking will fail in stage 1 because it can’t find the tbd.
|
||||
disallowedPackages' = builtins.fromJSON (builtins.readFile ../metadata/disallowed-packages.json);
|
||||
in
|
||||
|
||||
{
|
||||
lib,
|
||||
jq,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
let
|
||||
disallowedPackages =
|
||||
if jq == null then
|
||||
lib.filter (p: p.package != "corecrypto") disallowedPackages'
|
||||
else
|
||||
disallowedPackages';
|
||||
in
|
||||
self: super: {
|
||||
# Remove headers and stubs for packages that are available in nixpkgs.
|
||||
buildPhase =
|
||||
super.buildPhase or ""
|
||||
+ ''
|
||||
${lib.concatMapStringsSep "\n" (
|
||||
pkg:
|
||||
lib.concatLines (
|
||||
[ ''echo "Removing headers and libraries from ${pkg.package}"'' ]
|
||||
++ (map (header: "rm -rf -- usr/include/${header}") pkg.headers or [ ])
|
||||
++ (map (framework: "rm -rf -- System/Library/Frameworks/${framework}") pkg.frameworks or [ ])
|
||||
++ (map (library: "rm -rf -- usr/lib/${library}") pkg.libraries or [ ])
|
||||
)
|
||||
) disallowedPackages}
|
||||
'';
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
{ lib, sdkVersion }:
|
||||
|
||||
let
|
||||
name = "MacOSX${lib.versions.majorMinor sdkVersion}.sdk";
|
||||
in
|
||||
self: super: {
|
||||
# Rewrite the stubs to point to dylibs in the SDK instead of at system locations. This is needed for umbrella
|
||||
# frameworks in older SDKs, which don’t also embed their stubs.
|
||||
buildPhase =
|
||||
super.buildPhase or ""
|
||||
+ ''
|
||||
echo "Rewriting stubs to reference the SDK location in the store"
|
||||
find . -name '*.tbd' -type f -exec sed -E \
|
||||
-e "/^install-name/n; s|( \\|'\\|\"\\|\\[)/usr/|\1$sdkpath/${name}/usr/|g" \
|
||||
-e "/^install-name/n; s|( \\|'\\|\"\\|\\[)/System/|\1$sdkpath/${name}/System/|g" \
|
||||
-i {} \;
|
||||
'';
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
{ }:
|
||||
|
||||
self: super: {
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
${super.buildPhase or ""}
|
||||
runHook postBuild
|
||||
'';
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,545 @@
|
||||
[
|
||||
{
|
||||
"package": "apache",
|
||||
"headers": [
|
||||
"apache2"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "apr",
|
||||
"headers": [
|
||||
"apr-1"
|
||||
],
|
||||
"libraries": [
|
||||
"libapr-1.*",
|
||||
"libaprutil-1.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "boringssl",
|
||||
"libraries": [
|
||||
"libboringssl.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "bzip2",
|
||||
"headers": [
|
||||
"bzlib.h"
|
||||
],
|
||||
"libraries": [
|
||||
"libbz2.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "corecrypto",
|
||||
"libraries": [
|
||||
"system/libcorecrypto*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "Csu",
|
||||
"libraries": [
|
||||
"*.o"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "cups",
|
||||
"headers": [
|
||||
"cups"
|
||||
],
|
||||
"libraries": [
|
||||
"libcups*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "curl",
|
||||
"headers": [
|
||||
"curl"
|
||||
],
|
||||
"libraries": [
|
||||
"libcurl.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "cyrus_sasl",
|
||||
"headers": [
|
||||
"sasl"
|
||||
],
|
||||
"libraries": [
|
||||
"libsasl*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "editline",
|
||||
"headers": [
|
||||
"editline.h",
|
||||
"editline"
|
||||
],
|
||||
"libraries": [
|
||||
"libedit.*",
|
||||
"libeditline.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "html-tidy",
|
||||
"headers": [
|
||||
"tidy*"
|
||||
],
|
||||
"libraries": [
|
||||
"libtidy.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "hunspell",
|
||||
"headers": [
|
||||
"hunspell"
|
||||
],
|
||||
"libraries": [
|
||||
"libhunspell*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "icu",
|
||||
"headers": [
|
||||
"unicode"
|
||||
],
|
||||
"libraries": [
|
||||
"libicucore.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "libarchive",
|
||||
"headers": [
|
||||
"archive.h",
|
||||
"archive_entry.h"
|
||||
],
|
||||
"libraries": [
|
||||
"libarchive.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "libc++",
|
||||
"headers": [
|
||||
"c++",
|
||||
"cxxabi.h",
|
||||
"__cxxabi_config.h"
|
||||
],
|
||||
"libraries": [
|
||||
"libc++*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "ld64",
|
||||
"libraries": [
|
||||
"libcodedirectory.*",
|
||||
"libcodedirectory_static.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "expat",
|
||||
"headers": [
|
||||
"expat.h",
|
||||
"expat_config.h",
|
||||
"expat_external.h"
|
||||
],
|
||||
"libraries": [
|
||||
"libexpat.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "libffi",
|
||||
"headers": [
|
||||
"ffi*"
|
||||
],
|
||||
"libraries": [
|
||||
"libffi*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "libgcc",
|
||||
"libraries": [
|
||||
"libgcc*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "libiconv",
|
||||
"headers": [
|
||||
"iconv.h",
|
||||
"libcharset.h",
|
||||
"localcharset.h"
|
||||
],
|
||||
"libraries": [
|
||||
"libcharset.*",
|
||||
"libiconv.*",
|
||||
"i18n"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "libiodbc",
|
||||
"libraries": [
|
||||
"libiodbc*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "libkrb4",
|
||||
"libraries": [
|
||||
"libkrb4.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "libkrb5",
|
||||
"headers": [
|
||||
"com_err.h",
|
||||
"gssapi",
|
||||
"gssapi.h",
|
||||
"gssrpc",
|
||||
"kadm5",
|
||||
"kdb.h",
|
||||
"krad.h",
|
||||
"krb5",
|
||||
"krb5.h",
|
||||
"profile.h",
|
||||
"verto-module.h",
|
||||
"verto.h"
|
||||
],
|
||||
"libraries": [
|
||||
"krb5",
|
||||
"libcom_err.*",
|
||||
"libgssapi_krb5.*",
|
||||
"libgssrpc.*",
|
||||
"libk5crypto.*",
|
||||
"libkadm5clnt.*",
|
||||
"libkadm5clnt_mit.*",
|
||||
"libkadm5srv.*",
|
||||
"libkadm5srv_mit.*",
|
||||
"libkdb5.*",
|
||||
"libkrad.*",
|
||||
"libkrb5*",
|
||||
"libkrb5support.*",
|
||||
"libverto.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "libpcap",
|
||||
"headers": [
|
||||
"pcap*"
|
||||
],
|
||||
"libraries": [
|
||||
"libpcap.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "libresolv",
|
||||
"headers": [
|
||||
"arpa/nameser.h",
|
||||
"arpa/nameser_compat.h",
|
||||
"dns.h",
|
||||
"dns_util.h",
|
||||
"nameser.h",
|
||||
"resolv.h"
|
||||
],
|
||||
"libraries": [
|
||||
"libresolv.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "libstdc++",
|
||||
"libraries": [
|
||||
"libstdc++.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "libsbuf",
|
||||
"headers": [
|
||||
"usbuf.h"
|
||||
],
|
||||
"libraries": [
|
||||
"libsbuf.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "libtermcap",
|
||||
"headers": [
|
||||
"termcap.h"
|
||||
],
|
||||
"libraries": [
|
||||
"libtermcap.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "libutil",
|
||||
"headers": [
|
||||
"libutil.h"
|
||||
],
|
||||
"libraries": [
|
||||
"libutil.*",
|
||||
"libutil1.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "libxml2",
|
||||
"headers": [
|
||||
"libxml",
|
||||
"libxml2"
|
||||
],
|
||||
"libraries": [
|
||||
"libxml2.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "libxo",
|
||||
"headers": [
|
||||
"libxo"
|
||||
],
|
||||
"libraries": [
|
||||
"libxo.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "libxslt",
|
||||
"headers": [
|
||||
"libexslt",
|
||||
"libxslt"
|
||||
],
|
||||
"libraries": [
|
||||
"libexslt.*",
|
||||
"libxslt.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "liby",
|
||||
"libraries": [
|
||||
"liby.a"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "marisa-trie",
|
||||
"libraries": [
|
||||
"libmarisa.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "ncurses",
|
||||
"headers": [
|
||||
"curses*",
|
||||
"cursslk.h",
|
||||
"eti.h",
|
||||
"etip.h",
|
||||
"form.h",
|
||||
"menu.h",
|
||||
"nc_tparm.h",
|
||||
"ncurses*",
|
||||
"panel.h",
|
||||
"term.h",
|
||||
"term_entry.h",
|
||||
"termcap.h",
|
||||
"tic.h",
|
||||
"unctrl.h"
|
||||
],
|
||||
"libraries": [
|
||||
"libcurses.*",
|
||||
"libform.*",
|
||||
"libformw.*",
|
||||
"libmenu.*",
|
||||
"libmenuw.*",
|
||||
"libncurses.*",
|
||||
"libncursesw.*",
|
||||
"libpanel.*",
|
||||
"libpanelw.*",
|
||||
"libtinfo.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "net-snmp",
|
||||
"headers": [
|
||||
"net-snmp"
|
||||
],
|
||||
"libraries": [
|
||||
"libnetsnmp*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "nghttp",
|
||||
"libraries": [
|
||||
"lib*nghttp2.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "openblas",
|
||||
"headers": [
|
||||
"cblas.h",
|
||||
"f77blas.h",
|
||||
"lapack.h",
|
||||
"lapacke.h",
|
||||
"lapacke_config.h",
|
||||
"lapacke_mangling.h",
|
||||
"lapacke_utils.h",
|
||||
"openblas_config.h"
|
||||
],
|
||||
"libraries": [
|
||||
"libblas.*",
|
||||
"libcblas.*",
|
||||
"libclapack.*",
|
||||
"libf77lapack.*",
|
||||
"liblapack.*",
|
||||
"liblapacke.*",
|
||||
"libopenblas.*",
|
||||
"libopenblas.*",
|
||||
"libopenblasp*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "openldap",
|
||||
"headers": [
|
||||
"lber.h",
|
||||
"lber_types.h",
|
||||
"ldap.h",
|
||||
"ldap_cdefs.h",
|
||||
"ldap_features.h",
|
||||
"ldap_schema.h",
|
||||
"ldap_utf8.h",
|
||||
"ldif.h",
|
||||
"openldap.h",
|
||||
"slapi-plugin.h"
|
||||
],
|
||||
"libraries": [
|
||||
"liblber.*",
|
||||
"liblber_r.*",
|
||||
"libldap.*",
|
||||
"libldap_r.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "openpam",
|
||||
"headers": [
|
||||
"security"
|
||||
],
|
||||
"libraries": [
|
||||
"libpam.*",
|
||||
"pam_*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "pcre",
|
||||
"headers": [
|
||||
"pcre.h",
|
||||
"pcreposix.h"
|
||||
],
|
||||
"libraries": [
|
||||
"libpcre.*",
|
||||
"libpcre2*",
|
||||
"libpcreposix.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "php",
|
||||
"headers": [
|
||||
"php"
|
||||
],
|
||||
"libraries": [
|
||||
"php"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "postgresql",
|
||||
"libraries": [
|
||||
"libecpg*",
|
||||
"libpg*",
|
||||
"libpq*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "python",
|
||||
"headers": [
|
||||
"python*"
|
||||
],
|
||||
"frameworks": [
|
||||
"Python.framework"
|
||||
],
|
||||
"libraries": [
|
||||
"libpython*",
|
||||
"python*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "readline",
|
||||
"headers": [
|
||||
"readline"
|
||||
],
|
||||
"libraries": [
|
||||
"libhistory.*",
|
||||
"libreadline.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "ruby",
|
||||
"frameworks": [
|
||||
"Ruby.framework"
|
||||
],
|
||||
"libraries": [
|
||||
"libruby.*",
|
||||
"ruby"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "sqlite3",
|
||||
"headers": [
|
||||
"sqlite3.h",
|
||||
"sqlite3ext.h"
|
||||
],
|
||||
"libraries": [
|
||||
"libsqlite3.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "swift",
|
||||
"libraries": [
|
||||
"swift/shims"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "tcl",
|
||||
"headers": [
|
||||
"tcl*",
|
||||
"tk*"
|
||||
],
|
||||
"frameworks": [
|
||||
"Tcl.framework",
|
||||
"Tk.framework"
|
||||
],
|
||||
"libraries": [
|
||||
"libtcl*",
|
||||
"libtk*",
|
||||
"tclConfig.sh",
|
||||
"tkConfig.sh"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "xar",
|
||||
"headers": [
|
||||
"xar"
|
||||
],
|
||||
"libraries": [
|
||||
"libxar.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "xz",
|
||||
"headers": [
|
||||
"lzma*"
|
||||
],
|
||||
"libraries": [
|
||||
"liblzma.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"package": "zlib",
|
||||
"headers": [
|
||||
"zconf.h",
|
||||
"zlib.h"
|
||||
],
|
||||
"libraries": [
|
||||
"libz.*"
|
||||
]
|
||||
}
|
||||
]
|
||||
@@ -0,0 +1,47 @@
|
||||
{
|
||||
"10.12": {
|
||||
"url": "http://swcdn.apple.com/content/downloads/22/62/041-88607/wg8avdk0jo75k9a13gentz9stwqgrqmcv6/CLTools_SDK_OSX1012.pkg",
|
||||
"version": "10.12.2",
|
||||
"hash": "sha256-Jf2WIB9bY/rPwe0AOW3YWJY/6EqVe41yhezdTGOO3M8="
|
||||
},
|
||||
"10.13": {
|
||||
"url": "http://swcdn.apple.com/content/downloads/33/36/041-90419-A_7JJ4H9ZHO2/xs88ob5wjz6riz7g6764twblnvksusg4ps/CLTools_SDK_macOS1013.pkg",
|
||||
"version": "10.13.2",
|
||||
"hash": "sha256-8nd55fiJLfRWABAbMaHXjp6i20RqupmKedwmhb3S0/A="
|
||||
},
|
||||
"10.14": {
|
||||
"url": "http://swcdn.apple.com/content/downloads/41/57/061-26573-A_JMOA8GZGDR/lj8yrtu8dgs40fw9k8f5fkoviwkp0og6vs/CLTools_SDK_macOS1014.pkg",
|
||||
"version": "10.14.6",
|
||||
"hash": "sha256-NMNkycIl3AVZCw0ZpHNkaeYVS9LAZVSddHw5loL9dhk="
|
||||
},
|
||||
"10.15": {
|
||||
"url": "https://swcdn.apple.com/content/downloads/50/51/071-29699-A_YC8SX0OHH3/7479xojqghsvgtnt3dxjpnxuz9sjpmbmds/CLTools_macOSLMOS_SDK.pkg",
|
||||
"version": "10.15.6",
|
||||
"hash": "sha256-mPJQC+v4yNiOCKLQfhidB2WH2MMclSCP1odvOoGdVPw="
|
||||
},
|
||||
"11": {
|
||||
"url": "https://swcdn.apple.com/content/downloads/02/62/071-54303-A_EU2CL1YVT7/943i95dpeyi2ghlnj2mgyq3t202t5gf18b/CLTools_macOSNMOS_SDK.pkg",
|
||||
"version": "11.3",
|
||||
"hash": "sha256-/go8utcx3jprf6c8V/DUbXwsmNYSFchOAai1OaJs3Bg="
|
||||
},
|
||||
"12": {
|
||||
"url": "https://swcdn.apple.com/content/downloads/24/42/002-83793-A_74JRE8GVAT/rlnkct919wgc5c0pjq986z5bb9h62uvni2/CLTools_macOSNMOS_SDK.pkg",
|
||||
"version": "12.3",
|
||||
"hash": "sha256-qG21ssNUmkqxPLTXALGP2N/RBHu8NMlI1dWvGlV+Wm8="
|
||||
},
|
||||
"13": {
|
||||
"url": "https://swcdn.apple.com/content/downloads/15/62/032-84673-A_7A1TG1RF8Z/xpc8q44ggn2pkn82iwr0fi1zeb9cxi8ath/CLTools_macOSNMOS_SDK.pkg",
|
||||
"version": "13.3",
|
||||
"hash": "sha256-zZ4pbgoXunLGwdYDemxOfyH4CE5WGfMy2s5jN+0q4B4="
|
||||
},
|
||||
"14": {
|
||||
"url": "https://swcdn.apple.com/content/downloads/14/48/052-59890-A_I0F5YGAY0Y/p9n40hio7892gou31o1v031ng6fnm9sb3c/CLTools_macOSNMOS_SDK.pkg",
|
||||
"version": "14.4",
|
||||
"hash": "sha256-QozDiwY0Czc0g45vPD7G4v4Ra+3DujCJbSads3fJjjM="
|
||||
},
|
||||
"15": {
|
||||
"url": "https://swcdn.apple.com/content/downloads/33/46/042-32691-A_3MH7S3118O/3dblccqo9ws17dc5lk3hojfbt3s74q0ql6/CLTools_macOSNMOS_SDK.pkg",
|
||||
"version": "15.0",
|
||||
"hash": "sha256-JhaAPyfX46D+9sematdAYAORw40JP3xvleWRz7Hj/1s="
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,120 @@
|
||||
let
|
||||
sdkVersions = builtins.fromJSON (builtins.readFile ./metadata/versions.json);
|
||||
in
|
||||
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
substitute,
|
||||
|
||||
# Specifies the major version used for the SDK. Uses `hostPlatform.darwinSdkVersion` by default.
|
||||
darwinSdkMajorVersion ? (
|
||||
if lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11" then
|
||||
lib.versions.majorMinor stdenv.hostPlatform.darwinSdkVersion
|
||||
else
|
||||
lib.versions.major stdenv.hostPlatform.darwinSdkVersion
|
||||
),
|
||||
# Enabling bootstrap disables propagation. Defaults to `false` (meaning to propagate certain packages and `xcrun`)
|
||||
# except in stage0 of the Darwin stdenv bootstrap.
|
||||
enableBootstrap ? stdenv.name == "bootstrap-stage0-stdenv-darwin",
|
||||
|
||||
# Required by various phases
|
||||
callPackage,
|
||||
jq,
|
||||
}:
|
||||
|
||||
let
|
||||
sdkInfo =
|
||||
sdkVersions.${darwinSdkMajorVersion}
|
||||
or (lib.throw "Unsupported SDK major version: ${darwinSdkMajorVersion}");
|
||||
sdkVersion = sdkInfo.version;
|
||||
|
||||
fetchSDK = callPackage ./common/fetch-sdk.nix { };
|
||||
|
||||
phases = lib.composeManyExtensions (
|
||||
[
|
||||
(callPackage ./common/add-core-symbolication.nix { })
|
||||
(callPackage ./common/derivation-options.nix { })
|
||||
(callPackage ./common/passthru-private-frameworks.nix { inherit sdkVersion; })
|
||||
(callPackage ./common/passthru-source-release-files.nix { inherit sdkVersion; })
|
||||
(callPackage ./common/remove-disallowed-packages.nix { })
|
||||
]
|
||||
# Only process stubs and convert them to tbd-v4 if jq is available. This can be made unconditional once
|
||||
# the bootstrap tools have jq and libtapi.
|
||||
++ lib.optional (jq != null) (callPackage ./common/process-stubs.nix { })
|
||||
# Avoid infinite recursions by not propagating certain packages, so they can themselves build with the SDK.
|
||||
++ lib.optionals (!enableBootstrap) [
|
||||
(callPackage ./common/propagate-inputs.nix { })
|
||||
(callPackage ./common/propagate-xcrun.nix { })
|
||||
]
|
||||
++ [
|
||||
# These have to happen last.
|
||||
(callPackage ./common/rewrite-sdk-paths.nix { inherit sdkVersion; })
|
||||
(callPackage ./common/run-build-phase-hooks.nix { })
|
||||
]
|
||||
);
|
||||
in
|
||||
stdenvNoCC.mkDerivation (
|
||||
lib.extends phases (finalAttrs: {
|
||||
pname = "apple-sdk";
|
||||
inherit (sdkInfo) version;
|
||||
|
||||
src = fetchSDK sdkInfo;
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
setupHooks = [
|
||||
# `role.bash` is copied from `../build-support/setup-hooks/role.bash` due to the requirements not to reference
|
||||
# paths outside the package when it is in `by-name`. It needs to be kept in sync, but it fortunately does not
|
||||
# change often. Once `build-support` is available as a package (or some other mechanism), it should be changed
|
||||
# to whatever that replacement is.
|
||||
./setup-hooks/role.bash
|
||||
(substitute {
|
||||
src = ./setup-hooks/sdk-hook.sh;
|
||||
substitutions = [
|
||||
"--subst-var-by"
|
||||
"sdkVersion"
|
||||
(lib.escapeShellArgs (lib.splitVersion sdkVersion))
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
installPhase =
|
||||
let
|
||||
sdkName = "MacOSX${lib.versions.majorMinor sdkVersion}.sdk";
|
||||
sdkMajor = lib.versions.major sdkVersion;
|
||||
in
|
||||
''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$sdkpath"
|
||||
|
||||
cp -rd . "$sdkpath/${sdkName}"
|
||||
${lib.optionalString (lib.versionAtLeast finalAttrs.version "11.0") ''
|
||||
ln -s "${sdkName}" "$sdkpath/MacOSX${sdkMajor}.sdk"
|
||||
''}
|
||||
ln -s "${sdkName}" "$sdkpath/MacOSX.sdk"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
sdkroot = finalAttrs.finalPackage + "/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
description = "Frameworks and libraries required for building packages on Darwin";
|
||||
homepage = "https://developer.apple.com";
|
||||
maintainers = lib.teams.darwin.members;
|
||||
platforms = lib.platforms.darwin;
|
||||
badPlatforms =
|
||||
lib.optionals (lib.versionAtLeast sdkVersion "10.15") [ lib.systems.inspect.patterns.is32bit ]
|
||||
++ lib.optionals (lib.versionOlder sdkVersion "11.0") [ lib.systems.inspect.patterns.isAarch ];
|
||||
};
|
||||
})
|
||||
)
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user