Merge branch 'staging' into staging-next
This commit is contained in:
Vladimír Čunát
commit
577f40b8a9
@ -46,11 +46,16 @@ rustPlatform.buildRustPackage rec {
|
||||
}
|
||||
```
|
||||
|
||||
`buildRustPackage` requires either a `cargoHash` (preferred) or a
|
||||
`cargoSha256` attribute, computed over all crate sources of this package.
|
||||
`cargoHash` supports [SRI](https://www.w3.org/TR/SRI/) hashes and should be
|
||||
preferred over `cargoSha256` which was used for traditional Nix SHA-256 hashes.
|
||||
For example:
|
||||
`buildRustPackage` requires a `cargoHash` attribute, computed over all crate sources of this package.
|
||||
|
||||
::: {.warning}
|
||||
`cargoSha256` is already deprecated, and is subject to removal in favor of
|
||||
`cargoHash` which supports [SRI](https://www.w3.org/TR/SRI/) hashes.
|
||||
|
||||
If you are still using `cargoSha256`, you can simply replace it with
|
||||
`cargoHash` and recompute the hash, or convert the original sha256 to SRI
|
||||
hash using `nix-hash --to-sri --type sha256 "<original sha256>"`.
|
||||
:::
|
||||
|
||||
```nix
|
||||
{
|
||||
@ -58,7 +63,7 @@ For example:
|
||||
}
|
||||
```
|
||||
|
||||
Exception: If the application has cargo `git` dependencies, the `cargoHash`/`cargoSha256`
|
||||
Exception: If the application has cargo `git` dependencies, the `cargoHash`
|
||||
approach will not work, and you will need to copy the `Cargo.lock` file of the application
|
||||
to nixpkgs and continue with the next section for specifying the options of the `cargoLock`
|
||||
section.
|
||||
@ -76,14 +81,6 @@ then be taken from the failed build. A fake hash can be used for
|
||||
}
|
||||
```
|
||||
|
||||
For `cargoSha256` you can use:
|
||||
|
||||
```nix
|
||||
{
|
||||
cargoSha256 = lib.fakeSha256;
|
||||
}
|
||||
```
|
||||
|
||||
Per the instructions in the [Cargo Book](https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html)
|
||||
best practices guide, Rust applications should always commit the `Cargo.lock`
|
||||
file in git to ensure a reproducible build. However, a few packages do not, and
|
||||
@ -98,7 +95,7 @@ directory into a tar.gz archive.
|
||||
The tarball with vendored dependencies contains a directory with the
|
||||
package's `name`, which is normally composed of `pname` and
|
||||
`version`. This means that the vendored dependencies hash
|
||||
(`cargoHash`/`cargoSha256`) is dependent on the package name and
|
||||
(`cargoHash`) is dependent on the package name and
|
||||
version. The `cargoDepsName` attribute can be used to use another name
|
||||
for the directory of vendored dependencies. For example, the hash can
|
||||
be made invariant to the version by setting `cargoDepsName` to
|
||||
@ -123,7 +120,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
### Importing a `Cargo.lock` file {#importing-a-cargo.lock-file}
|
||||
|
||||
Using a vendored hash (`cargoHash`/`cargoSha256`) is tedious when using
|
||||
Using a vendored hash (`cargoHash`) is tedious when using
|
||||
`buildRustPackage` within a project, since it requires that the hash
|
||||
is updated after every change to `Cargo.lock`. Therefore,
|
||||
`buildRustPackage` also supports vendoring dependencies directly from
|
||||
|
||||
@ -228,6 +228,9 @@
|
||||
- The `services.mxisd` module has been removed as both [mxisd](https://github.com/kamax-matrix/mxisd) and [ma1sd](https://github.com/ma1uta/ma1sd) are not maintained any longer.
|
||||
Consequently the package `pkgs.ma1sd` has also been removed.
|
||||
|
||||
- `ffmpeg_5` has been removed. Please use the unversioned `ffmpeg`,
|
||||
pin a newer version, or if necessary pin `ffmpeg_4` for compatibility.
|
||||
|
||||
## Other Notable Changes {#sec-release-24.11-notable-changes}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
@ -236,6 +239,11 @@
|
||||
|
||||
- The `stackclashprotection` hardening flag has been added, though disabled by default.
|
||||
|
||||
- `cargoSha256` in `rustPlatform.buildRustPackage` has been deprecated in favor
|
||||
of `cargoHash` which supports SRI hashes. See
|
||||
[buildRustPackage: Compiling Rust applications with Cargo](https://nixos.org/manual/nixpkgs/unstable/#compiling-rust-applications-with-cargo)
|
||||
for more information.
|
||||
|
||||
- `hareHook` has been added as the language framework for Hare. From now on, it,
|
||||
not the `hare` package, should be added to `nativeBuildInputs` when building
|
||||
Hare programs.
|
||||
@ -267,6 +275,8 @@
|
||||
{option}`services.gitlab-runner.services.<name>.authenticationTokenConfigFile` instead of the former
|
||||
{option}`services.gitlab-runner.services.<name>.registrationConfigFile` option.
|
||||
|
||||
- `iproute2` now has libbpf support.
|
||||
|
||||
## Detailed migration information {#sec-release-24.11-migration}
|
||||
|
||||
### `sound` options removal {#sec-release-24.11-migration-sound}
|
||||
|
||||
@ -33,7 +33,6 @@ with lib;
|
||||
fastfetch = super.fastfetch.override { vulkanSupport = false; waylandSupport = false; x11Support = false; };
|
||||
ffmpeg = super.ffmpeg.override { ffmpegVariant = "headless"; };
|
||||
ffmpeg_4 = super.ffmpeg_4.override { ffmpegVariant = "headless"; };
|
||||
ffmpeg_5 = super.ffmpeg_5.override { ffmpegVariant = "headless"; };
|
||||
ffmpeg_6 = super.ffmpeg_6.override { ffmpegVariant = "headless"; };
|
||||
ffmpeg_7 = super.ffmpeg_7.override { ffmpegVariant = "headless"; };
|
||||
# dep of graphviz, libXpm is optional for Xpm support
|
||||
|
||||
@ -47,7 +47,7 @@ let
|
||||
);
|
||||
|
||||
driverPaths = [
|
||||
pkgs.addOpenGLRunpath.driverLink
|
||||
pkgs.addDriverRunpath.driverLink
|
||||
|
||||
# mesa:
|
||||
config.hardware.opengl.package
|
||||
@ -84,7 +84,7 @@ in
|
||||
{
|
||||
opengl.paths = config.hardware.opengl.extraPackages ++ [
|
||||
config.hardware.opengl.package
|
||||
pkgs.addOpenGLRunpath.driverLink
|
||||
pkgs.addDriverRunpath.driverLink
|
||||
"/dev/dri"
|
||||
];
|
||||
}
|
||||
|
||||
@ -403,7 +403,7 @@ in
|
||||
path = with pkgs; [
|
||||
# unfree:
|
||||
# config.boot.kernelPackages.nvidiaPackages.latest.bin
|
||||
ffmpeg_5-headless
|
||||
ffmpeg-headless
|
||||
libva-utils
|
||||
procps
|
||||
radeontop
|
||||
|
||||
@ -452,9 +452,9 @@ in {
|
||||
|
||||
extraPackages = mkOption {
|
||||
type = with types; listOf package;
|
||||
default = with pkgs; [ exiftool ffmpeg_5-headless graphicsmagick-imagemagick-compat ];
|
||||
defaultText = literalExpression "with pkgs; [ exiftool graphicsmagick-imagemagick-compat ffmpeg_5-headless ]";
|
||||
example = literalExpression "with pkgs; [ exiftool imagemagick ffmpeg_5-full ]";
|
||||
default = with pkgs; [ exiftool ffmpeg-headless graphicsmagick-imagemagick-compat ];
|
||||
defaultText = literalExpression "with pkgs; [ exiftool ffmpeg-headless graphicsmagick-imagemagick-compat ]";
|
||||
example = literalExpression "with pkgs; [ exiftool ffmpeg-full imagemagick ]";
|
||||
description = ''
|
||||
List of extra packages to include in the executable search path of the service unit.
|
||||
These are needed by various configurable components such as:
|
||||
|
||||
@ -34,7 +34,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
# needs special setup on Linux, dunno if it can work on Darwin
|
||||
# https://github.com/NixOS/nixpkgs/issues/19098
|
||||
sed -i -e '/juce::juce_recommended_lto_flags/d' Source/CMakeLists.txt
|
||||
'';
|
||||
|
||||
|
||||
@ -49,7 +49,6 @@ stdenv.mkDerivation rec {
|
||||
postPatch = ''
|
||||
# 1. Remove hardcoded LTO flags: needs extra setup on Linux,
|
||||
# possibly broken on Darwin
|
||||
# https://github.com/NixOS/nixpkgs/issues/19098
|
||||
# 2. Disable automatic copying of built plugins during buildPhase, it defaults
|
||||
# into user home and we want to have building & installing separated.
|
||||
sed -i \
|
||||
|
||||
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-DtF6asSlLdC2m/0JTBo4YUx9HgsojpfiqVdqaIwniKA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw=";
|
||||
cargoHash = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ] ++ lib.optionals stdenv.isDarwin [
|
||||
rustPlatform.bindgenHook
|
||||
|
||||
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-gs6uytX4rm2JrJ4UbtHJDg+b+Z1ZjcsuUR0b13jQIy4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-7zV/AsSZHk99ROC1301nkwJ22dvh4afeCI//G1zWHu8=";
|
||||
cargoHash = "sha256-7zV/AsSZHk99ROC1301nkwJ22dvh4afeCI//G1zWHu8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -99,11 +99,6 @@ in stdenv.mkDerivation rec {
|
||||
)
|
||||
'';
|
||||
|
||||
# Meson is no longer able to pick up Boost automatically.
|
||||
# https://github.com/NixOS/nixpkgs/issues/86131
|
||||
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
|
||||
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications";
|
||||
mainProgram = "pulseeffects";
|
||||
|
||||
@ -61,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
postPatch = lib.optionalString (stdenv.isLinux) ''
|
||||
# needs special setup on Linux, dunno if it can work on Darwin
|
||||
# https://github.com/NixOS/nixpkgs/issues/19098
|
||||
# Also, I get issues with linking without that, not sure why
|
||||
sed -i -e '/juce::juce_recommended_lto_flags/d' CMakeLists.txt
|
||||
patchShebangs linux/install.sh
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
, expat
|
||||
, libid3tag
|
||||
, libopus
|
||||
, ffmpeg_5
|
||||
, ffmpeg
|
||||
, soundtouch
|
||||
, pcre
|
||||
, portaudio
|
||||
@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
expat
|
||||
ffmpeg_5
|
||||
ffmpeg
|
||||
file
|
||||
flac
|
||||
glib
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, cctools
|
||||
, darwin
|
||||
, fetchurl
|
||||
, autoconf
|
||||
@ -30,11 +31,11 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-FD7JFM80wrruqBWjYnJHZh2f2GZJ6XDQmUQ0XetnWBg=";
|
||||
};
|
||||
|
||||
# when building on darwin we need dawin.cctools to provide the correct libtool
|
||||
# when building on darwin we need cctools to provide the correct libtool
|
||||
# as libwally-core detects the host as darwin and tries to add the -static
|
||||
# option to libtool, also we have to add the modified gsed package.
|
||||
nativeBuildInputs = [ autoconf autogen automake gettext libtool lowdown protobuf py3 unzip which ]
|
||||
++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.autoSignDarwinBinariesHook ];
|
||||
++ lib.optionals stdenv.isDarwin [ cctools darwin.autoSignDarwinBinariesHook ];
|
||||
|
||||
buildInputs = [ gmp libsodium sqlite zlib jq ];
|
||||
|
||||
|
||||
@ -18,12 +18,8 @@ stdenv.mkDerivation rec {
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
# Replace hardcoded g++ with c++ so clang can be used
|
||||
# on darwin
|
||||
#
|
||||
# lto must be disabled on darwin as well due to
|
||||
# https://github.com/NixOS/nixpkgs/issues/19098
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail 'g++' 'c++' \
|
||||
--replace-fail '-flto' ""
|
||||
--replace-fail 'g++' 'c++'
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-e0YtpakEaaWdgu+bMr2VFoUc6+SUMFk4hYtSyk5aApY=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-RkJjAmZ++4nc/lLh8g0LxGq2DjZGxQEjFOl8Yzx116A=";
|
||||
cargoHash = "sha256-RkJjAmZ++4nc/lLh8g0LxGq2DjZGxQEjFOl8Yzx116A=";
|
||||
|
||||
meta = {
|
||||
description = "Graphical console greeter for greetd";
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
{ lib, pkgs }:
|
||||
|
||||
lib.makeScope pkgs.newScope (self:
|
||||
let
|
||||
inherit (self) callPackage;
|
||||
in {
|
||||
sources = import ./sources.nix {
|
||||
inherit lib;
|
||||
inherit (pkgs) fetchurl;
|
||||
};
|
||||
|
||||
ed = callPackage (self.sources.ed) { };
|
||||
edUnstable = callPackage (self.sources.edUnstable) { };
|
||||
})
|
||||
@ -1,32 +0,0 @@
|
||||
{ pname
|
||||
, version
|
||||
, src
|
||||
, patches ? [ ]
|
||||
, meta
|
||||
}:
|
||||
|
||||
# Note: this package is used for bootstrapping fetchurl, and thus cannot use
|
||||
# fetchpatch! All mutable patches (generated by GitHub or cgit) that are needed
|
||||
# here should be included directly in Nixpkgs as files.
|
||||
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, lzip
|
||||
, runtimeShellPackage
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version src patches;
|
||||
|
||||
nativeBuildInputs = [ lzip ];
|
||||
buildInputs = [ runtimeShellPackage ];
|
||||
|
||||
configureFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
inherit meta;
|
||||
}
|
||||
@ -1,45 +0,0 @@
|
||||
{ lib
|
||||
, fetchurl
|
||||
}:
|
||||
|
||||
let
|
||||
meta = {
|
||||
description = "GNU implementation of the standard Unix editor";
|
||||
longDescription = ''
|
||||
GNU ed is a line-oriented text editor. It is used to create, display,
|
||||
modify and otherwise manipulate text files, both interactively and via
|
||||
shell scripts. A restricted version of ed, red, can only edit files in the
|
||||
current directory and cannot execute shell commands. Ed is the 'standard'
|
||||
text editor in the sense that it is the original editor for Unix, and thus
|
||||
widely available. For most purposes, however, it is superseded by
|
||||
full-screen editors such as GNU Emacs or GNU Moe.
|
||||
'';
|
||||
license = lib.licenses.gpl3Plus;
|
||||
homepage = "https://www.gnu.org/software/ed/";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
in
|
||||
{
|
||||
ed = let
|
||||
pname = "ed";
|
||||
version = "1.20.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/ed/ed-${version}.tar.lz";
|
||||
hash = "sha256-Zf7HMY9IwsoX8zSsD0cD3v5iA3uxPMI5IN4He1+iRSM=";
|
||||
};
|
||||
in import ./generic.nix {
|
||||
inherit pname version src meta;
|
||||
};
|
||||
|
||||
edUnstable = let
|
||||
pname = "ed";
|
||||
version = "1.20-pre2";
|
||||
src = fetchurl {
|
||||
url = "http://download.savannah.gnu.org/releases/ed/ed-${version}.tar.lz";
|
||||
hash = "sha256-bHTDeMhVNNo3qqDNoBNaBA+DHDa4WJpfQNcTvAUPgsY=";
|
||||
};
|
||||
in import ./generic.nix {
|
||||
inherit pname version src meta;
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -64,26 +64,6 @@ self: let
|
||||
'';
|
||||
});
|
||||
|
||||
org = super.org.overrideAttrs (old: {
|
||||
dontUnpack = false;
|
||||
patches = old.patches or [ ] ++ lib.optionals (lib.versionOlder old.version "9.7.5") [
|
||||
# security fix backported from 9.7.5
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8";
|
||||
hash = "sha256-bGgsnTSn6SMu1J8P2BfJjrKx2845FCsUB2okcIrEjDg=";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
postPatch = old.postPatch or "" + "\n" + ''
|
||||
pushd ..
|
||||
local content_directory=${old.ename}-${old.version}
|
||||
src=$PWD/$content_directory.tar
|
||||
tar --create --verbose --file=$src $content_directory
|
||||
popd
|
||||
'';
|
||||
dontBuild = true;
|
||||
});
|
||||
|
||||
pq = super.pq.overrideAttrs (old: {
|
||||
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.postgresql ];
|
||||
});
|
||||
|
||||
@ -295,10 +295,10 @@
|
||||
elpaBuild {
|
||||
pname = "auctex";
|
||||
ename = "auctex";
|
||||
version = "14.0.5";
|
||||
version = "14.0.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/auctex-14.0.5.tar";
|
||||
sha256 = "0sycj6ad5jazmsxq37hsnvbywkpj66lrw3d3mxqr1wqkb67cdd3k";
|
||||
url = "https://elpa.gnu.org/packages/auctex-14.0.6.tar";
|
||||
sha256 = "0cajri7x6770wjkrasa0p2s0dvcp74fpv1znac5wdfiwhvl1i9yr";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -306,6 +306,44 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
auctex-cont-latexmk = callPackage ({ auctex
|
||||
, elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib }:
|
||||
elpaBuild {
|
||||
pname = "auctex-cont-latexmk";
|
||||
ename = "auctex-cont-latexmk";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/auctex-cont-latexmk-0.2.tar";
|
||||
sha256 = "0ggyjxjqwpx3h1963i8w96m6kisc65ni9hksn2kjfjddnj1hx0hf";
|
||||
};
|
||||
packageRequires = [ auctex emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/auctex-cont-latexmk.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
auctex-label-numbers = callPackage ({ auctex
|
||||
, elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib }:
|
||||
elpaBuild {
|
||||
pname = "auctex-label-numbers";
|
||||
ename = "auctex-label-numbers";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/auctex-label-numbers-0.2.tar";
|
||||
sha256 = "1cd68yvpm061r9k4x6rvy3g2wdynv5gbjg2dyp06nkrgvakdb00x";
|
||||
};
|
||||
packageRequires = [ auctex emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/auctex-label-numbers.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
aumix-mode = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "aumix-mode";
|
||||
@ -824,10 +862,10 @@
|
||||
elpaBuild {
|
||||
pname = "colorful-mode";
|
||||
ename = "colorful-mode";
|
||||
version = "1.0.0";
|
||||
version = "1.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/colorful-mode-1.0.0.tar";
|
||||
sha256 = "1gmbrb5z3rmw0fjrdymfbcx74szcy963dx53ksykvfd9355azj3x";
|
||||
url = "https://elpa.gnu.org/packages/colorful-mode-1.0.4.tar";
|
||||
sha256 = "0vy1rqv9aknns81v97j6dwr621hbs0489p7bhpg7k7qva39i97vs";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
@ -937,10 +975,10 @@
|
||||
elpaBuild {
|
||||
pname = "compat";
|
||||
ename = "compat";
|
||||
version = "29.1.4.5";
|
||||
version = "30.0.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/compat-29.1.4.5.tar";
|
||||
sha256 = "0i57hs3ak5y0fsfdwg87ib64ny0ar1nk67f5dy2qrm8x3i0h086s";
|
||||
url = "https://elpa.gnu.org/packages/compat-30.0.0.0.tar";
|
||||
sha256 = "0z7049xkdyx22ywq821d19lp73ywaz6brxj461h0h2a73y7999cl";
|
||||
};
|
||||
packageRequires = [ emacs seq ];
|
||||
meta = {
|
||||
@ -952,10 +990,10 @@
|
||||
elpaBuild {
|
||||
pname = "consult";
|
||||
ename = "consult";
|
||||
version = "1.6";
|
||||
version = "1.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/consult-1.6.tar";
|
||||
sha256 = "00wsv6dvlyf7ygi586pdyhgp7f5ic2qqyqjz3g2g8hmgya5javdb";
|
||||
url = "https://elpa.gnu.org/packages/consult-1.7.tar";
|
||||
sha256 = "02ji5yxa92jj7chs6al5amjdag1waz2sngbbk45mgg9nv81b4d3c";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
@ -972,10 +1010,10 @@
|
||||
elpaBuild {
|
||||
pname = "consult-denote";
|
||||
ename = "consult-denote";
|
||||
version = "0.0.0";
|
||||
version = "0.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/consult-denote-0.0.0.tar";
|
||||
sha256 = "191qf8knrmimam98jv8kgrl6mfrnwpdmw160s5qw6wcik7j4z6kv";
|
||||
url = "https://elpa.gnu.org/packages/consult-denote-0.1.1.tar";
|
||||
sha256 = "0yhf9fifas87rs4wdapszbpx1xqyq44izjq7vzpyvdlh5a5fhhx1";
|
||||
};
|
||||
packageRequires = [ consult denote emacs ];
|
||||
meta = {
|
||||
@ -1036,10 +1074,10 @@
|
||||
elpaBuild {
|
||||
pname = "corfu";
|
||||
ename = "corfu";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/corfu-1.3.tar";
|
||||
sha256 = "13y0dws1k4682v039ab6b0xxqlg7anknscqs20bmj8lfm2z48znx";
|
||||
url = "https://elpa.gnu.org/packages/corfu-1.4.tar";
|
||||
sha256 = "0jsxrs08zwbwb1mzn8a2ja3wr2w34cx8ca09l4fz05labv7p7i85";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
@ -1156,10 +1194,10 @@
|
||||
elpaBuild {
|
||||
pname = "csv-mode";
|
||||
ename = "csv-mode";
|
||||
version = "1.23";
|
||||
version = "1.25";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/csv-mode-1.23.tar";
|
||||
sha256 = "0b5qcxdp7y78mfgcvh9plfc0l5qbwsvrj1bswyimrzg210zhk4zm";
|
||||
url = "https://elpa.gnu.org/packages/csv-mode-1.25.tar";
|
||||
sha256 = "15yhhn742fqq7699i6jsimg3gpifrhhybiav1qwwzq4prmk9g984";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -1201,10 +1239,10 @@
|
||||
elpaBuild {
|
||||
pname = "dape";
|
||||
ename = "dape";
|
||||
version = "0.11.1";
|
||||
version = "0.13.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/dape-0.11.1.tar";
|
||||
sha256 = "0i04wwklypzxh78gwd9zjxjm3lwi2sn7qpqnlgd6n8hhcigyzhp0";
|
||||
url = "https://elpa.gnu.org/packages/dape-0.13.0.tar";
|
||||
sha256 = "1zzghp73yh1vl9vf3njkqyhh6vmmx6klnd9z37p62467bd19wr8a";
|
||||
};
|
||||
packageRequires = [ emacs jsonrpc ];
|
||||
meta = {
|
||||
@ -1291,10 +1329,10 @@
|
||||
elpaBuild {
|
||||
pname = "denote";
|
||||
ename = "denote";
|
||||
version = "2.3.5";
|
||||
version = "3.0.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/denote-2.3.5.tar";
|
||||
sha256 = "1l8nlr8q7c51j2f528a0568pa3ywfv8pr47fzpd6pk2scc0y372b";
|
||||
url = "https://elpa.gnu.org/packages/denote-3.0.6.tar";
|
||||
sha256 = "1wq44r4j624hiwpyzkrrbk998321wzj7x45y9rwy4gpi8f6xi1nv";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1537,10 +1575,10 @@
|
||||
elpaBuild {
|
||||
pname = "do-at-point";
|
||||
ename = "do-at-point";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/do-at-point-0.1.1.tar";
|
||||
sha256 = "1lqnarb9jiig85j3dv37jsqkmmfbcwb52i2akimzf9r57pypiylk";
|
||||
url = "https://elpa.gnu.org/packages/do-at-point-0.1.2.tar";
|
||||
sha256 = "0kirhg78ra6311hx1f1kpqhpxjxxg61gnzsh9j6id10f92h6m5gz";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1702,10 +1740,10 @@
|
||||
elpaBuild {
|
||||
pname = "eev";
|
||||
ename = "eev";
|
||||
version = "20240513";
|
||||
version = "20240710";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/eev-20240513.tar";
|
||||
sha256 = "133blp5696f2adxqny5kyylr6s3n3vixs0ak1n3i58sqb0krp2pj";
|
||||
url = "https://elpa.gnu.org/packages/eev-20240710.tar";
|
||||
sha256 = "1mia27ilfg4zkkwvwy3m24ypgi1fm8k27rm77xwjpq87pb2wvr02";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1827,16 +1865,22 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ellama = callPackage ({ elpaBuild, emacs, fetchurl, lib, llm, spinner }:
|
||||
ellama = callPackage ({ compat
|
||||
, elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib
|
||||
, llm
|
||||
, spinner }:
|
||||
elpaBuild {
|
||||
pname = "ellama";
|
||||
ename = "ellama";
|
||||
version = "0.9.4";
|
||||
version = "0.11.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ellama-0.9.4.tar";
|
||||
sha256 = "12l8k7dwcdgndy0zbdgkhx94y46fkzwjrbwlgj9922zbk38nnz46";
|
||||
url = "https://elpa.gnu.org/packages/ellama-0.11.9.tar";
|
||||
sha256 = "0h41hsvz34v0gb9d7d8aw6phc7iyrpbs0r8djsz59yd0ijzbz12j";
|
||||
};
|
||||
packageRequires = [ emacs llm spinner ];
|
||||
packageRequires = [ compat emacs llm spinner ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/ellama.html";
|
||||
license = lib.licenses.free;
|
||||
@ -1907,10 +1951,10 @@
|
||||
elpaBuild {
|
||||
pname = "ement";
|
||||
ename = "ement";
|
||||
version = "0.15";
|
||||
version = "0.15.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ement-0.15.tar";
|
||||
sha256 = "0mphkvmsmrfyr3prr5a2x6ijr27z96ixpaxs9871kn7f1x0brn5r";
|
||||
url = "https://elpa.gnu.org/packages/ement-0.15.1.tar";
|
||||
sha256 = "1n1kxj5p6c6cnz6z54zayyb9lr6l54crfh5im2pbwpai1bk8lsld";
|
||||
};
|
||||
packageRequires = [
|
||||
emacs
|
||||
@ -1936,10 +1980,10 @@
|
||||
elpaBuild {
|
||||
pname = "emms";
|
||||
ename = "emms";
|
||||
version = "19";
|
||||
version = "20.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/emms-19.tar";
|
||||
sha256 = "1k0hybw826f2hlw8m0aihkydlkdzjsgvrfibpsqrxxcn9d7zxwjd";
|
||||
url = "https://elpa.gnu.org/packages/emms-20.1.tar";
|
||||
sha256 = "0h0v31f1q7k45k8s9kncvim3a7np7fgjz4qg9v8gjc5ag01dzwkx";
|
||||
};
|
||||
packageRequires = [ cl-lib nadvice seq ];
|
||||
meta = {
|
||||
@ -1996,10 +2040,10 @@
|
||||
elpaBuild {
|
||||
pname = "erc";
|
||||
ename = "erc";
|
||||
version = "5.5";
|
||||
version = "5.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/erc-5.5.tar";
|
||||
sha256 = "02649ijnpyalk0k1yq1dcinj92awhbnkia2x9sdb9xjk80xw1gqp";
|
||||
url = "https://elpa.gnu.org/packages/erc-5.6.tar";
|
||||
sha256 = "16qyfsa2q297xcfjiacjms9v14kjwwrsp3m8kcs5s50aavzfvc1s";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
@ -2119,16 +2163,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }:
|
||||
exwm = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, xelb }:
|
||||
elpaBuild {
|
||||
pname = "exwm";
|
||||
ename = "exwm";
|
||||
version = "0.28";
|
||||
version = "0.31";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/exwm-0.28.tar";
|
||||
sha256 = "11j1ciyrnzkbcb7ffgs670mxqd1xbxf41c6jwnwwqjfzmqhsm0m4";
|
||||
url = "https://elpa.gnu.org/packages/exwm-0.31.tar";
|
||||
sha256 = "1i1k8w641n2fd6xifl92pvvq0s0b820lq76d1cyc7iyaqs44w9qq";
|
||||
};
|
||||
packageRequires = [ xelb ];
|
||||
packageRequires = [ compat emacs xelb ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/exwm.html";
|
||||
license = lib.licenses.free;
|
||||
@ -2168,10 +2212,10 @@
|
||||
elpaBuild {
|
||||
pname = "filechooser";
|
||||
ename = "filechooser";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/filechooser-0.2.0.tar";
|
||||
sha256 = "1fjf8bmdrrrgbv4sgx4nry5pl8plg9kyzyfd038985v3dsqasi9q";
|
||||
url = "https://elpa.gnu.org/packages/filechooser-0.2.1.tar";
|
||||
sha256 = "1q9yxq4c6lp1fllcd60mcj4bs0ia03i649jilknkcp7jmjihq07i";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
@ -2477,10 +2521,10 @@
|
||||
elpaBuild {
|
||||
pname = "gnu-elpa-keyring-update";
|
||||
ename = "gnu-elpa-keyring-update";
|
||||
version = "2022.12";
|
||||
version = "2022.12.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update-2022.12.tar";
|
||||
sha256 = "0pabqsfw0d9knfigpcsrwfw7qrf2vlg9h0i582212gsqd7snlnxb";
|
||||
url = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update-2022.12.1.tar";
|
||||
sha256 = "0yb81ly7y5262fpa0n96yngqmz1rgfwrpm0a6vqghdpr5x0c8z6n";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -2593,16 +2637,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
greader = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
greader = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, seq }:
|
||||
elpaBuild {
|
||||
pname = "greader";
|
||||
ename = "greader";
|
||||
version = "0.9.20";
|
||||
version = "0.11.13";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/greader-0.9.20.tar";
|
||||
sha256 = "11n88xmr2qa5as5kpy4yy616nlh08nw5rkcbgmf9skgka3g1hmip";
|
||||
url = "https://elpa.gnu.org/packages/greader-0.11.13.tar";
|
||||
sha256 = "0kyfws0b5dahf96b9wx06hmx0a0qsmywx6bay6xl6a5a4lchszsn";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
packageRequires = [ compat emacs seq ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/greader.html";
|
||||
license = lib.licenses.free;
|
||||
@ -2627,10 +2671,10 @@
|
||||
elpaBuild {
|
||||
pname = "gtags-mode";
|
||||
ename = "gtags-mode";
|
||||
version = "1.6";
|
||||
version = "1.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/gtags-mode-1.6.tar";
|
||||
sha256 = "1r3ih44kzkrx9bmfl8ri2yv90b7g4nhb0vvdnz1ba3f44x15ppjx";
|
||||
url = "https://elpa.gnu.org/packages/gtags-mode-1.8.tar";
|
||||
sha256 = "1rd0a3q45b5i46hi8snf25cyv65b7699ghbz8c6hrr4991h3ksll";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2780,6 +2824,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
idlwave = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "idlwave";
|
||||
ename = "idlwave";
|
||||
version = "6.5.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/idlwave-6.5.1.tar";
|
||||
sha256 = "0dd0dm92qyin8k4kgavrg82zwjhv6wsjq6gk55rzcspx0s8y2c24";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/idlwave.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ilist = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "ilist";
|
||||
@ -2999,10 +3058,10 @@
|
||||
elpaBuild {
|
||||
pname = "jinx";
|
||||
ename = "jinx";
|
||||
version = "1.7";
|
||||
version = "1.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/jinx-1.7.tar";
|
||||
sha256 = "13snfsrwdbn23fdwpk42xp24x8bskl8sgsbq51nr896smjp2x3b4";
|
||||
url = "https://elpa.gnu.org/packages/jinx-1.9.tar";
|
||||
sha256 = "0k6km295y5w13kl18v9b6y0szdccf89nbar3zkdincy4iid5z6n1";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
@ -3281,14 +3340,29 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
literate-scratch = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "literate-scratch";
|
||||
ename = "literate-scratch";
|
||||
version = "1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/literate-scratch-1.0.tar";
|
||||
sha256 = "1rby70wfj6g0p4hc6xqzwgqj2g8780qm5mnjn95bl2wrvdi0ds6n";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/literate-scratch.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
llm = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }:
|
||||
elpaBuild {
|
||||
pname = "llm";
|
||||
ename = "llm";
|
||||
version = "0.15.0";
|
||||
version = "0.16.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/llm-0.15.0.tar";
|
||||
sha256 = "1y3gs8zsng87wmlkx5az396hci4xyn0ww7cbaavisqbrxam51qvj";
|
||||
url = "https://elpa.gnu.org/packages/llm-0.16.1.tar";
|
||||
sha256 = "1fqn4fdxhazpmlh8pf6ihnh132zjqrixry3kyymsmwang6vh2y7s";
|
||||
};
|
||||
packageRequires = [ emacs plz ];
|
||||
meta = {
|
||||
@ -3360,10 +3434,10 @@
|
||||
elpaBuild {
|
||||
pname = "loccur";
|
||||
ename = "loccur";
|
||||
version = "1.2.4";
|
||||
version = "1.2.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/loccur-1.2.4.tar";
|
||||
sha256 = "1b8rmbl03k8fdy217ngbxsc0a3jxxmqnwshf72f4iay8ln4hasgk";
|
||||
url = "https://elpa.gnu.org/packages/loccur-1.2.5.tar";
|
||||
sha256 = "0dp7nhafx5x0aw4svd826bqsrn6qk46w12p04w7khpk7d9768a8x";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3645,10 +3719,10 @@
|
||||
elpaBuild {
|
||||
pname = "mpdired";
|
||||
ename = "mpdired";
|
||||
version = "1";
|
||||
version = "2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/mpdired-1.tar";
|
||||
sha256 = "08lc0j25kxisykd2l9v4iamalmm5hzsnsm026v808krny28wwbp3";
|
||||
url = "https://elpa.gnu.org/packages/mpdired-2.tar";
|
||||
sha256 = "0synpanyqka8nyz9mma69na307vm5pjvn21znbdvz56gka2mbg23";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4039,10 +4113,10 @@
|
||||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "9.6.30";
|
||||
version = "9.7.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-9.6.30.tar";
|
||||
sha256 = "0h2p7gjiys5ch68y35l6bpw9pp852vprmfzi0dk86z1wkilhycip";
|
||||
url = "https://elpa.gnu.org/packages/org-9.7.6.tar";
|
||||
sha256 = "0pxjc2bydnzd31wg71nfh7zzf3mhsnzm2nd7p736bj1w0pvg89ng";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4099,10 +4173,10 @@
|
||||
elpaBuild {
|
||||
pname = "org-modern";
|
||||
ename = "org-modern";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-modern-1.2.tar";
|
||||
sha256 = "1bm8kkcrn0glsb69sapj1zmb2ygd4sxksb3gag4hw1v5w3g51jjh";
|
||||
url = "https://elpa.gnu.org/packages/org-modern-1.3.tar";
|
||||
sha256 = "1lpl9q9ijyp6pwb0qap9ydzkq0pd5xkbfpaqy1nvcy5b906jmkdj";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
@ -4189,10 +4263,10 @@
|
||||
elpaBuild {
|
||||
pname = "orgalist";
|
||||
ename = "orgalist";
|
||||
version = "1.14";
|
||||
version = "1.16";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/orgalist-1.14.tar";
|
||||
sha256 = "02diwanqldzr42aaa5kqcj1xgxmf1k6rqhk9zv40psqpzgd1yms5";
|
||||
url = "https://elpa.gnu.org/packages/orgalist-1.16.tar";
|
||||
sha256 = "0j78g12q66piclraa2nvd1h4ri8d6cnw5jahw6k5zi4xfjag6yx3";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4350,16 +4424,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
persist = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
persist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "persist";
|
||||
ename = "persist";
|
||||
version = "0.6";
|
||||
version = "0.6.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/persist-0.6.tar";
|
||||
sha256 = "1p6h211xk0lrk4zqlm51rsms5lza9ymx6ayh9ij0afqrjqgffw77";
|
||||
url = "https://elpa.gnu.org/packages/persist-0.6.1.tar";
|
||||
sha256 = "1a7lls81q247mbkcnifmsva16cfjjma6yihxmj5zrj8ac774z9j3";
|
||||
};
|
||||
packageRequires = [];
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/persist.html";
|
||||
license = lib.licenses.free;
|
||||
@ -4399,10 +4473,10 @@
|
||||
elpaBuild {
|
||||
pname = "plz";
|
||||
ename = "plz";
|
||||
version = "0.8";
|
||||
version = "0.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/plz-0.8.tar";
|
||||
sha256 = "0kg275kq5hi83ry0n83w8pi0qn2lmlv9gnxcbwf1dcqk7n9i2v64";
|
||||
url = "https://elpa.gnu.org/packages/plz-0.9.tar";
|
||||
sha256 = "1wgcfwrmbw6bl00midhn99hn3fvbavkibb4r6s99yzmd48vyapr8";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4515,14 +4589,44 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
preview-auto = callPackage ({ auctex, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "preview-auto";
|
||||
ename = "preview-auto";
|
||||
version = "0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/preview-auto-0.3.tar";
|
||||
sha256 = "19jih2bn6ac82jx6w7jhv9hbz47c8argv24lfglvv6532fda218r";
|
||||
};
|
||||
packageRequires = [ auctex emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/preview-auto.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
preview-tailor = callPackage ({ auctex, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "preview-tailor";
|
||||
ename = "preview-tailor";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/preview-tailor-0.2.tar";
|
||||
sha256 = "1mqh2myz5w84f4n01ibd695h4mnqwjxmg7rvs7pz3sylz1xqyks7";
|
||||
};
|
||||
packageRequires = [ auctex emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/preview-tailor.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
project = callPackage ({ elpaBuild, emacs, fetchurl, lib, xref }:
|
||||
elpaBuild {
|
||||
pname = "project";
|
||||
ename = "project";
|
||||
version = "0.10.0";
|
||||
version = "0.11.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/project-0.10.0.tar";
|
||||
sha256 = "07lv41asdah2v3k6nrc73z3pjhsm7viygr12ly9p96g2yw11irg6";
|
||||
url = "https://elpa.gnu.org/packages/project-0.11.1.tar";
|
||||
sha256 = "1973d6z7nx9pp5gadqk8p71v6s5wqja40a0f8zjrn6rrnfarrcd0";
|
||||
};
|
||||
packageRequires = [ emacs xref ];
|
||||
meta = {
|
||||
@ -4714,10 +4818,10 @@
|
||||
elpaBuild {
|
||||
pname = "rcirc-sqlite";
|
||||
ename = "rcirc-sqlite";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/rcirc-sqlite-1.0.1.tar";
|
||||
sha256 = "0n0492s500gplmv7l8n8l7s3rpm1nli3n706n9f91qc15z6p6mcv";
|
||||
url = "https://elpa.gnu.org/packages/rcirc-sqlite-1.0.2.tar";
|
||||
sha256 = "128wq3mm2ckcchly6c31i87jrkq19q7ysvx5fg34jhjg53dkrz28";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -5725,6 +5829,36 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
tex-item = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "tex-item";
|
||||
ename = "tex-item";
|
||||
version = "0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tex-item-0.1.tar";
|
||||
sha256 = "0ggbn3lk64cv6pnw97ww7vn250jchj80zx3hvkcqlccyw34x6ziy";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/tex-item.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
tex-parens = callPackage ({ auctex, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "tex-parens";
|
||||
ename = "tex-parens";
|
||||
version = "0.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tex-parens-0.4.tar";
|
||||
sha256 = "08mj18sh32z61kjizf3y6bb0zvb6qgdhrk9q7b15bi5mllk834zd";
|
||||
};
|
||||
packageRequires = [ auctex emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/tex-parens.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
theme-buffet = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "theme-buffet";
|
||||
@ -5838,10 +5972,10 @@
|
||||
elpaBuild {
|
||||
pname = "tramp";
|
||||
ename = "tramp";
|
||||
version = "2.6.3";
|
||||
version = "2.7.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.6.3.tar";
|
||||
sha256 = "0z44mfpvn4qy2xc2fsiahw3xir140ljna8aq45dcb7qnmr044xjb";
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.7.1.tar";
|
||||
sha256 = "128k591219ffwbk1cifki0xx94rg6b7crh7gmhaiqfa6jylqhcg8";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -5898,10 +6032,10 @@
|
||||
elpaBuild {
|
||||
pname = "transient";
|
||||
ename = "transient";
|
||||
version = "0.6.0";
|
||||
version = "0.7.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/transient-0.6.0.tar";
|
||||
sha256 = "0rk4gafx3yylzawiny86ml4jzrs8x6cf2bvmnv36p8l13wgp0w9p";
|
||||
url = "https://elpa.gnu.org/packages/transient-0.7.2.tar";
|
||||
sha256 = "0i68wpwxf729qxjxhafkp098wcmkqn06ka3hcqnlky2p1zl29hby";
|
||||
};
|
||||
packageRequires = [ compat emacs seq ];
|
||||
meta = {
|
||||
@ -6484,16 +6618,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
window-tool-bar = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
window-tool-bar = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "window-tool-bar";
|
||||
ename = "window-tool-bar";
|
||||
version = "0.2";
|
||||
version = "0.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/window-tool-bar-0.2.tar";
|
||||
sha256 = "191v21rrw1j560512mjn1s1avhirk1awy746xajjra8lb1ywnxw7";
|
||||
url = "https://elpa.gnu.org/packages/window-tool-bar-0.2.1.tar";
|
||||
sha256 = "06wf3kwc4sjd14ihagmahxjvk35skb28rh9yclpzbrvjqk0ss35v";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/window-tool-bar.html";
|
||||
license = lib.licenses.free;
|
||||
@ -6624,16 +6758,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }:
|
||||
xelb = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "xelb";
|
||||
ename = "xelb";
|
||||
version = "0.18";
|
||||
version = "0.20";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/xelb-0.18.tar";
|
||||
sha256 = "1qixb236z01azjbc1xycji99rjkq747hip4gcf0gli1is8ink0bs";
|
||||
url = "https://elpa.gnu.org/packages/xelb-0.20.tar";
|
||||
sha256 = "12ikrnvik1n1fdc6ixx53d0z84v269wi463380k0i5zb6q8ncwpk";
|
||||
};
|
||||
packageRequires = [ cl-generic emacs ];
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/xelb.html";
|
||||
license = lib.licenses.free;
|
||||
@ -6673,10 +6807,10 @@
|
||||
elpaBuild {
|
||||
pname = "xref";
|
||||
ename = "xref";
|
||||
version = "1.6.3";
|
||||
version = "1.7.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/xref-1.6.3.tar";
|
||||
sha256 = "0mir1nhic0rnz12d8i1n6m2ihfynhkkg8yccy4v9j4kd31w6f1gs";
|
||||
url = "https://elpa.gnu.org/packages/xref-1.7.0.tar";
|
||||
sha256 = "0jy49zrkqiqg9131k24y6nyjnq2am4dwwdrqmginrrwzvi3y9d24";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
||||
@ -141,26 +141,6 @@ self: let
|
||||
};
|
||||
});
|
||||
|
||||
org = super.org.overrideAttrs (old: {
|
||||
dontUnpack = false;
|
||||
patches = old.patches or [ ] ++ lib.optionals (lib.versionOlder old.version "9.7.5") [
|
||||
# security fix backported from 9.7.5
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8";
|
||||
hash = "sha256-bGgsnTSn6SMu1J8P2BfJjrKx2845FCsUB2okcIrEjDg=";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
postPatch = old.postPatch or "" + "\n" + ''
|
||||
pushd ..
|
||||
local content_directory=${old.ename}-${old.version}
|
||||
src=$PWD/$content_directory.tar
|
||||
tar --create --verbose --file=$src $content_directory
|
||||
popd
|
||||
'';
|
||||
dontBuild = true;
|
||||
});
|
||||
|
||||
plz = super.plz.overrideAttrs (
|
||||
old: {
|
||||
dontUnpack = false;
|
||||
|
||||
@ -13,8 +13,6 @@ in
|
||||
|
||||
agda2-mode = callPackage ./manual-packages/agda2-mode { };
|
||||
|
||||
beancount = callPackage ./manual-packages/beancount { };
|
||||
|
||||
cask = callPackage ./manual-packages/cask { };
|
||||
|
||||
codeium = callPackage ./manual-packages/codeium { };
|
||||
@ -33,8 +31,6 @@ in
|
||||
|
||||
emacs-conflict = callPackage ./manual-packages/emacs-conflict { };
|
||||
|
||||
enlight = callPackage ./manual-packages/enlight { };
|
||||
|
||||
evil-markdown = callPackage ./manual-packages/evil-markdown { };
|
||||
|
||||
font-lock-plus = callPackage ./manual-packages/font-lock-plus { };
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
{ lib
|
||||
, melpaBuild
|
||||
, fetchFromGitHub
|
||||
, emacs
|
||||
, writeText
|
||||
}:
|
||||
|
||||
let
|
||||
rev = "519bfd868f206ed2fc538a57cdb631c4fec3c93e";
|
||||
in
|
||||
melpaBuild {
|
||||
pname = "beancount";
|
||||
version = "20230205.436";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "beancount";
|
||||
repo = "beancount-mode";
|
||||
inherit rev;
|
||||
hash = "sha256-nTEXJdPEPZpNm06uYvRxLuiOHmsiIgMLerd//dA0+KQ=";
|
||||
};
|
||||
|
||||
commit = rev;
|
||||
|
||||
recipe = writeText "recipe" ''
|
||||
(beancount :repo "beancount/beancount-mode" :fetcher github)
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/beancount/beancount-mode";
|
||||
description = "Emacs major-mode to work with Beancount ledger files";
|
||||
maintainers = with lib.maintainers; [ polarmutex ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
inherit (emacs.meta) platforms;
|
||||
};
|
||||
}
|
||||
@ -1,27 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
compat,
|
||||
fetchFromGitHub,
|
||||
melpaBuild,
|
||||
}:
|
||||
|
||||
melpaBuild {
|
||||
pname = "enlight";
|
||||
version = "20240601.1150";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ichernyshovvv";
|
||||
repo = "enlight";
|
||||
rev = "76753736da1777c8f9ebbeb08beec15b330a5878";
|
||||
hash = "sha256-Ccfv4Ud5B4L4FfIOI2PDKikV9x8x3a7VeHYDyLV7t4g=";
|
||||
};
|
||||
|
||||
packageRequires = [ compat ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/ichernyshovvv/enlight";
|
||||
description = "Highly customizable startup screen for Emacs";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
};
|
||||
}
|
||||
@ -139,10 +139,10 @@
|
||||
elpaBuild {
|
||||
pname = "arduino-mode";
|
||||
ename = "arduino-mode";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/arduino-mode-1.3.0.tar";
|
||||
sha256 = "167b35s34x51qnlx59sawaz4wzlnk2kf9130ylz2b1bj7jy5n27a";
|
||||
url = "https://elpa.nongnu.org/nongnu/arduino-mode-1.3.1.tar";
|
||||
sha256 = "1k42qx7kgm8svv70czzlkmm3c7cddf93bqvf6267hbkaihhyd21y";
|
||||
};
|
||||
packageRequires = [ emacs spinner ];
|
||||
meta = {
|
||||
@ -212,6 +212,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
beancount = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "beancount";
|
||||
ename = "beancount";
|
||||
version = "0.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/beancount-0.9.tar";
|
||||
sha256 = "1s0w17mq8kilkrd33pan78px6mz5z96d7gvdmy2shg3hvj1jbq09";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/beancount.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
better-jumper = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "better-jumper";
|
||||
@ -376,10 +391,10 @@
|
||||
elpaBuild {
|
||||
pname = "cider";
|
||||
ename = "cider";
|
||||
version = "1.13.1";
|
||||
version = "1.15.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/cider-1.13.1.tar";
|
||||
sha256 = "0df5z57schfszlp1vkb6fiiadx12qlpk5qzfw61g664a2i654fsg";
|
||||
url = "https://elpa.nongnu.org/nongnu/cider-1.15.1.tar";
|
||||
sha256 = "0qfh98hrlxpr71jqgsghmv687sp90iaffcgb7q5candcq8dscfb6";
|
||||
};
|
||||
packageRequires = [
|
||||
clojure-mode
|
||||
@ -400,10 +415,10 @@
|
||||
elpaBuild {
|
||||
pname = "clojure-mode";
|
||||
ename = "clojure-mode";
|
||||
version = "5.18.1";
|
||||
version = "5.19.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.18.1.tar";
|
||||
sha256 = "1p9nh4p3skjxbsnyj2in3m8jdyrrj8iw0malfcz0ppc4d7zm6klx";
|
||||
url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.19.0.tar";
|
||||
sha256 = "10dpdi4yc7bbga2mllk46jfy58ppj8vlhs37zd9vlk9rnfc54r99";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -518,6 +533,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
csv2ledger = callPackage ({ csv-mode, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "csv2ledger";
|
||||
ename = "csv2ledger";
|
||||
version = "1.5.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/csv2ledger-1.5.4.tar";
|
||||
sha256 = "1h935g97fjrs1q0yz0q071zp91bhsb3yg13zqpp8il5gif20qqls";
|
||||
};
|
||||
packageRequires = [ csv-mode emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/csv2ledger.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
cyberpunk-theme = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "cyberpunk-theme";
|
||||
@ -702,6 +732,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dslide = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "dslide";
|
||||
ename = "dslide";
|
||||
version = "0.5.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/dslide-0.5.3.tar";
|
||||
sha256 = "11q807jp90y37s1njmr6qlnqi9pk371gj8mwg57kgjvc55qdyas5";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/dslide.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
eat = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "eat";
|
||||
@ -766,10 +811,10 @@
|
||||
elpaBuild {
|
||||
pname = "elpher";
|
||||
ename = "elpher";
|
||||
version = "3.6.0";
|
||||
version = "3.6.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/elpher-3.6.0.tar";
|
||||
sha256 = "1xf3kl09inswx4w03fxj35n1ypvlin39z493fw4ksnpf79ccfk4x";
|
||||
url = "https://elpa.nongnu.org/nongnu/elpher-3.6.2.tar";
|
||||
sha256 = "168cyhkp2q57k26r961c3g521qf8gj2b5rl8k1fg4z60y63s1rpk";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1218,10 +1263,10 @@
|
||||
elpaBuild {
|
||||
pname = "geiser";
|
||||
ename = "geiser";
|
||||
version = "0.30";
|
||||
version = "0.31";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-0.30.tar";
|
||||
sha256 = "0h63skslmc23rjlsrqmcnqf2s431ml0wmkbza38j44kzxnsz0x5g";
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-0.31.tar";
|
||||
sha256 = "0szyasza76ak4qny9v9i3sk1m3mahlxcvvsk078q8rp9cms5lzkv";
|
||||
};
|
||||
packageRequires = [ emacs project ];
|
||||
meta = {
|
||||
@ -1409,10 +1454,10 @@
|
||||
elpaBuild {
|
||||
pname = "git-modes";
|
||||
ename = "git-modes";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.2.tar";
|
||||
sha256 = "0hdy4wpnyrn3a8i9yxk5gvsggnpgpg6r0wip0zmhcl9nxi4h6kb3";
|
||||
url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.3.tar";
|
||||
sha256 = "0fhmzx4cmj7g4cbv3h1gjwhwnvfqcgiifhz4hl98r7zzmz8z7kdk";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
@ -1529,10 +1574,10 @@
|
||||
elpaBuild {
|
||||
pname = "gptel";
|
||||
ename = "gptel";
|
||||
version = "0.8.6";
|
||||
version = "0.9.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/gptel-0.8.6.tar";
|
||||
sha256 = "1ds0i32bdmdi5w68cjxm9xlg0m9n29yr4hl6sqi8gn3kgswfx1sb";
|
||||
url = "https://elpa.nongnu.org/nongnu/gptel-0.9.0.tar";
|
||||
sha256 = "1crcng1h6i64h6l3pha96k3hy2hga73pp0wy4i9gdrc1ra0dbjf4";
|
||||
};
|
||||
packageRequires = [ compat emacs transient ];
|
||||
meta = {
|
||||
@ -1645,16 +1690,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
helm = callPackage ({ elpaBuild, fetchurl, helm-core, lib, popup, wfnames }:
|
||||
helm = callPackage ({ elpaBuild, fetchurl, helm-core, lib, wfnames }:
|
||||
elpaBuild {
|
||||
pname = "helm";
|
||||
ename = "helm";
|
||||
version = "3.9.8";
|
||||
version = "3.9.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-3.9.8.tar";
|
||||
sha256 = "1vcz3vj6drp5v66s3nsrai39rcwp1q3l2qdd1qxw7n58m4fgrkm6";
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-3.9.9.tar";
|
||||
sha256 = "1k3jq2miivj881h0mpl68zgd229kj50axynsgxizdddg56nfsdm0";
|
||||
};
|
||||
packageRequires = [ helm-core popup wfnames ];
|
||||
packageRequires = [ helm-core wfnames ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/helm.html";
|
||||
license = lib.licenses.free;
|
||||
@ -1664,10 +1709,10 @@
|
||||
elpaBuild {
|
||||
pname = "helm-core";
|
||||
ename = "helm-core";
|
||||
version = "3.9.8";
|
||||
version = "3.9.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.8.tar";
|
||||
sha256 = "03l5sva3qhfmjdpys1k2pbcja58fsdxljvmffjx70j7wyclb3v03";
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.9.tar";
|
||||
sha256 = "067x4g19w032671545bfah4262xyhgnwxkaw8pdk4fqd5znw0yck";
|
||||
};
|
||||
packageRequires = [ async emacs ];
|
||||
meta = {
|
||||
@ -1675,6 +1720,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
hideshowvis = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "hideshowvis";
|
||||
ename = "hideshowvis";
|
||||
version = "0.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/hideshowvis-0.8.tar";
|
||||
sha256 = "0xx2jjv95r1nhlf729y0zplfpjlh46nfnixmd3f5jc3z2pc6zf5b";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/hideshowvis.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
highlight-parentheses = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
@ -1888,10 +1948,10 @@
|
||||
elpaBuild {
|
||||
pname = "j-mode";
|
||||
ename = "j-mode";
|
||||
version = "1.1.1";
|
||||
version = "2.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/j-mode-1.1.1.tar";
|
||||
sha256 = "056af7l7rn116nygln41rsq2val5s3y0pz1pj2736mqsx3lcyiy2";
|
||||
url = "https://elpa.nongnu.org/nongnu/j-mode-2.0.1.tar";
|
||||
sha256 = "0kk29s3xqad72jxvzzbl4b4z8b4l7xx1vyfcbsj8ns8hv8cip3l3";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -1948,10 +2008,10 @@
|
||||
elpaBuild {
|
||||
pname = "keycast";
|
||||
ename = "keycast";
|
||||
version = "1.3.3";
|
||||
version = "1.4.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/keycast-1.3.3.tar";
|
||||
sha256 = "048j5q4hpr8y89lrcqwbcqjazj52rak8jv8nl6fs4sqjik10zcji";
|
||||
url = "https://elpa.nongnu.org/nongnu/keycast-1.4.0.tar";
|
||||
sha256 = "0az8jixzncbz042il45hq1hwj6qvcm53f2fns19bspf1k4v4dphk";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
@ -2092,10 +2152,10 @@
|
||||
elpaBuild {
|
||||
pname = "mastodon";
|
||||
ename = "mastodon";
|
||||
version = "1.0.21";
|
||||
version = "1.0.24";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.21.tar";
|
||||
sha256 = "1qlpkg28q4iyvjjzv8b40b8q7ni7rc94lj5akgzxbzw4avpp1217";
|
||||
url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.24.tar";
|
||||
sha256 = "05jj62klf7cf44nlkjxdzg63xi4z30n5c4806xd5i2yw19nfw023";
|
||||
};
|
||||
packageRequires = [ emacs persist request ];
|
||||
meta = {
|
||||
@ -2427,6 +2487,26 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org-transclusion-http = callPackage ({ elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib
|
||||
, org-transclusion
|
||||
, plz }:
|
||||
elpaBuild {
|
||||
pname = "org-transclusion-http";
|
||||
ename = "org-transclusion-http";
|
||||
version = "0.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/org-transclusion-http-0.4.tar";
|
||||
sha256 = "1k57672w0dcw63dp1a6m5fc0pkm8p5la9811m16r440i7wqq0kmr";
|
||||
};
|
||||
packageRequires = [ emacs org-transclusion plz ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/org-transclusion-http.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org-tree-slide = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "org-tree-slide";
|
||||
@ -2715,10 +2795,10 @@
|
||||
elpaBuild {
|
||||
pname = "racket-mode";
|
||||
ename = "racket-mode";
|
||||
version = "1.0.20240514.112412";
|
||||
version = "1.0.20240621.124732";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240514.112412.tar";
|
||||
sha256 = "1ysjq9jvkm8qibj0z6j4q90sx19xyz9z9qzdlci9mw872r21ak9h";
|
||||
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240621.124732.tar";
|
||||
sha256 = "1b5kq8r2skssqzqg9iah8h9jmxgzhzlzi0spbk3wkiadqyw6flbs";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2865,10 +2945,10 @@
|
||||
elpaBuild {
|
||||
pname = "scad-mode";
|
||||
ename = "scad-mode";
|
||||
version = "93.3";
|
||||
version = "94.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/scad-mode-93.3.tar";
|
||||
sha256 = "1d3mv50n3d0qg1sxvp11a4i15vc75j9gpzlqcxnc0l1lqhn64rwh";
|
||||
url = "https://elpa.nongnu.org/nongnu/scad-mode-94.0.tar";
|
||||
sha256 = "1cqai7qb9m17rf7llkn9vbxddgn0ixcf3dbnsjk1aflvj8mq9nr3";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
@ -3090,10 +3170,10 @@
|
||||
elpaBuild {
|
||||
pname = "subed";
|
||||
ename = "subed";
|
||||
version = "1.2.11";
|
||||
version = "1.2.14";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-1.2.11.tar";
|
||||
sha256 = "0grzlxibv57qds3dml6yjpw9hag86hbkrb1f66k7qn5hxaadmvpw";
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-1.2.14.tar";
|
||||
sha256 = "0kzb054radxq9hqviadmbr4cln39yp7yz4inq4ip52rd3qdm8vy4";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3366,10 +3446,10 @@
|
||||
elpaBuild {
|
||||
pname = "undo-fu-session";
|
||||
ename = "undo-fu-session";
|
||||
version = "0.6";
|
||||
version = "0.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.6.tar";
|
||||
sha256 = "057izvr86har50z1sfk4s6r88w2ga57afwm2w9p5v14lq31vj7cp";
|
||||
url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.7.tar";
|
||||
sha256 = "1gly9fl8kvfssh2h90j9qcqvxvmnckn0x1wfm4qbz9ax57xvms23";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3506,10 +3586,10 @@
|
||||
elpaBuild {
|
||||
pname = "with-editor";
|
||||
ename = "with-editor";
|
||||
version = "3.3.2";
|
||||
version = "3.3.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/with-editor-3.3.2.tar";
|
||||
sha256 = "1yjx1w54qdjpmq5f7l3y19d4bayyk01rgd82c56swsaxsf4j5fpv";
|
||||
url = "https://elpa.nongnu.org/nongnu/with-editor-3.3.4.tar";
|
||||
sha256 = "1q9h181r1192zz5ff95rb3j2j69w9ha00qrap5df8cs73z8kh2vc";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
@ -3589,10 +3669,10 @@
|
||||
elpaBuild {
|
||||
pname = "xah-fly-keys";
|
||||
ename = "xah-fly-keys";
|
||||
version = "25.6.20240521220424";
|
||||
version = "25.9.20240703220947";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.6.20240521220424.tar";
|
||||
sha256 = "029hy3qmf6nvibbq9w2b964gzbw99lja595h4g1y5zzyrgzqrhrn";
|
||||
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.9.20240703220947.tar";
|
||||
sha256 = "1kg8qhr1wnbcm44bmvan62k68603pjickaaj68q7g78vkzlzwpya";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec {
|
||||
pname = "kibi";
|
||||
version = "0.2.2";
|
||||
|
||||
cargoSha256 = "sha256-ebUCkcUACganeq5U0XU4VIGClKDZGhUw6K3WBgTUUUw=";
|
||||
cargoHash = "sha256-ebUCkcUACganeq5U0XU4VIGClKDZGhUw6K3WBgTUUUw=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ilai-deutel";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
rec {
|
||||
version = "9.1.0509";
|
||||
version = "9.1.0595";
|
||||
|
||||
outputs = [ "out" "xxd" ];
|
||||
|
||||
@ -8,7 +8,7 @@ rec {
|
||||
owner = "vim";
|
||||
repo = "vim";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CATjUalRjvVjEfWT5evFAk//Oj4iB1fDBsRU5MhDyn4=";
|
||||
hash = "sha256-v8xVP1WuvE9XdQl1LDIq3pjaKyqPWM0fsFKcpIwPbNA=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -874,7 +874,7 @@
|
||||
inherit version;
|
||||
src = LanguageClient-neovim-src;
|
||||
|
||||
cargoSha256 = "H34UqJ6JOwuSABdOup5yKeIwFrGc83TUnw1ggJEx9o4=";
|
||||
cargoHash = "sha256-H34UqJ6JOwuSABdOup5yKeIwFrGc83TUnw1ggJEx9o4=";
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
# FIXME: Use impure version of CoreFoundation because of missing symbols.
|
||||
@ -1836,7 +1836,7 @@
|
||||
vim-markdown-composer-bin = rustPlatform.buildRustPackage {
|
||||
pname = "vim-markdown-composer-bin";
|
||||
inherit (super.vim-markdown-composer) src version;
|
||||
cargoSha256 = "sha256-Vie8vLTplhaVU4E9IohvxERfz3eBpd62m8/1Ukzk8e4=";
|
||||
cargoHash = "sha256-Vie8vLTplhaVU4E9IohvxERfz3eBpd62m8/1Ukzk8e4=";
|
||||
# tests require network access
|
||||
doCheck = false;
|
||||
};
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
|
||||
, xdg-user-dirs
|
||||
|
||||
, addOpenGLRunpath
|
||||
, addDriverRunpath
|
||||
|
||||
# Whether to pre-compile Python 2 bytecode for performance.
|
||||
, compilePy2Bytecode ? false
|
||||
@ -217,7 +217,7 @@ in stdenv.mkDerivation {
|
||||
exit 1
|
||||
fi
|
||||
|
||||
patchelf --add-rpath "${lib.makeLibraryPath wrappedLibs}:${addOpenGLRunpath.driverLink}/lib" \
|
||||
patchelf --add-rpath "${lib.makeLibraryPath wrappedLibs}:${addDriverRunpath.driverLink}/lib" \
|
||||
$out/libexec/darling/usr/libexec/darling/mldr
|
||||
'';
|
||||
|
||||
|
||||
@ -19,9 +19,6 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-ZptjlnOiF+hKuKYvBFJL95H5YQuR99d4biOco/MVEmE=";
|
||||
};
|
||||
|
||||
# work around https://github.com/NixOS/nixpkgs/issues/19098
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && stdenv.isDarwin) "-fno-lto";
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook qmake ];
|
||||
|
||||
buildInputs = [ qtbase qtdeclarative qtquickcontrols ];
|
||||
|
||||
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-k0WQu1n1sAHVor58jr060vD5/2rDrt1k5zzJlrK9WrU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-OQZPOiMTpoWabxHa3TJG8L3zq8WxMeFttw8xggSXsMA=";
|
||||
cargoHash = "sha256-OQZPOiMTpoWabxHa3TJG8L3zq8WxMeFttw8xggSXsMA=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [
|
||||
pkg-config
|
||||
|
||||
@ -82,9 +82,6 @@ python3Packages.buildPythonPackage rec {
|
||||
twisted
|
||||
];
|
||||
|
||||
# tests rely on nose
|
||||
doCheck = pythonOlder "3.12";
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
nose
|
||||
mock
|
||||
|
||||
@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-CC40TU38bJFnbJl2EHqeB9RBvbVUrBmRdZVS2GxqGu4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-cUE2IZOunR/NIo/qytORRfNqCsf87LfpKA8o/v4Nkhk=";
|
||||
cargoHash = "sha256-cUE2IZOunR/NIo/qytORRfNqCsf87LfpKA8o/v4Nkhk=";
|
||||
|
||||
nativeBuildInputs = [ glib pkg-config wrapGAppsHook4 ];
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-owP3G1Rygraifdc4iPURQ1Es0msNhYZIlfrtj0CSU6Y=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-NtXjlGkX8AzSw98xHPymzdnTipMIunyDbpSr4eVowa0=";
|
||||
cargoHash = "sha256-NtXjlGkX8AzSw98xHPymzdnTipMIunyDbpSr4eVowa0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ]
|
||||
++ lib.optional stdenv.isLinux pkg-config;
|
||||
|
||||
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-LTpaV/fgYUgA2M6Wz5qLHnTNywh13900g+umhgLvciM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-4hi1U4jl6QA7H8AKHlU+Hqz5iKGYHRXHDsrcqY7imkU=";
|
||||
cargoHash = "sha256-4hi1U4jl6QA7H8AKHlU+Hqz5iKGYHRXHDsrcqY7imkU=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, qtbase, wrapQtAppsHook, fetchFromGitHub,
|
||||
addOpenGLRunpath, poppler_utils, qtxmlpatterns, qtsvg, mesa, gcc, xvfb-run,
|
||||
addDriverRunpath, poppler_utils, qtxmlpatterns, qtsvg, mesa, gcc, xvfb-run,
|
||||
fontconfig, freetype, xorg, ccache, qmake, python3, qttools, git
|
||||
}:
|
||||
let
|
||||
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
addOpenGLRunpath
|
||||
addDriverRunpath
|
||||
xvfb-run
|
||||
fontconfig
|
||||
wrapQtAppsHook
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
OpenAL,
|
||||
OpenGL,
|
||||
SDL,
|
||||
addOpenGLRunpath,
|
||||
addDriverRunpath,
|
||||
alembic,
|
||||
blender,
|
||||
boost,
|
||||
@ -220,7 +220,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
python3Packages.wrapPython
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
addOpenGLRunpath
|
||||
addDriverRunpath
|
||||
cudaPackages.cuda_nvcc
|
||||
]
|
||||
++ lib.optionals waylandSupport [ pkg-config ];
|
||||
@ -344,7 +344,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
lib.optionalString cudaSupport ''
|
||||
for program in $out/bin/blender $out/bin/.blender-wrapped; do
|
||||
isELF "$program" || continue
|
||||
addOpenGLRunpath "$program"
|
||||
addDriverRunpath "$program"
|
||||
done
|
||||
''
|
||||
+ lib.optionalString stdenv.isDarwin ''
|
||||
|
||||
@ -50,8 +50,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
tenacity
|
||||
typer
|
||||
watchdog
|
||||
]
|
||||
++ typer.optional-dependencies.all;
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = with python3.pkgs; {
|
||||
aws = [ boto3 ];
|
||||
|
||||
@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
|
||||
# Cargo.lock is outdated
|
||||
cargoPatches = [ ./cargo-lock.patch ];
|
||||
|
||||
cargoSha256 = "sha256-keLcNttdM9JUnn3qi/bWkcObIHl3MRACDHKPSZuScOc=";
|
||||
cargoHash = "sha256-keLcNttdM9JUnn3qi/bWkcObIHl3MRACDHKPSZuScOc=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
CoreServices
|
||||
|
||||
@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-NJ1O8+NBG0y39bMOZeah2jSZlvnPrtpCtXrgAYmVrAc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-tNUWW0HgXl+tM9uciApLSkLDDkzrvAiWmiYs2y/dEOM=";
|
||||
cargoHash = "sha256-tNUWW0HgXl+tM9uciApLSkLDDkzrvAiWmiYs2y/dEOM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchzip
|
||||
, addOpenGLRunpath
|
||||
, addDriverRunpath
|
||||
, cmake
|
||||
, glibc_multi
|
||||
, glibc
|
||||
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
|
||||
git
|
||||
pkg-config
|
||||
] ++ lib.optionals withCuda [
|
||||
addOpenGLRunpath
|
||||
addDriverRunpath
|
||||
];
|
||||
|
||||
buildInputs = [ hwloc ] ++ (if withCuda then
|
||||
@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString withCuda ''
|
||||
addOpenGLRunpath $out/bin/FIRESTARTER_CUDA
|
||||
addDriverRunpath $out/bin/FIRESTARTER_CUDA
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, addOpenGLRunpath, cudatoolkit }:
|
||||
{ lib, stdenv, fetchFromGitHub, addDriverRunpath, cudatoolkit }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "gpu-burn";
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [ cudatoolkit ];
|
||||
|
||||
nativeBuildInputs = [ addOpenGLRunpath ];
|
||||
nativeBuildInputs = [ addDriverRunpath ];
|
||||
|
||||
makeFlags = [ "CUDAPATH=${cudatoolkit}" ];
|
||||
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
addOpenGLRunpath $out/bin/gpu_burn
|
||||
addDriverRunpath $out/bin/gpu_burn
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-HKAR4LJm0lrQgTOCqtYIRFbO3qHtPbr4Fpx2ek1oJ4Q=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-svvtZyfN91OT3yqxH6TgFhGYg9drpXsts4p2WqSHG8w=";
|
||||
cargoHash = "sha256-svvtZyfN91OT3yqxH6TgFhGYg9drpXsts4p2WqSHG8w=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
, libXfixes
|
||||
, libpulseaudio
|
||||
, libva
|
||||
, ffmpeg_5
|
||||
, ffmpeg_4
|
||||
, libpng
|
||||
, libjpeg8
|
||||
, curl
|
||||
@ -57,7 +57,7 @@ stdenvNoCC.mkDerivation {
|
||||
alsa-lib
|
||||
libpulseaudio
|
||||
libva
|
||||
ffmpeg_5
|
||||
ffmpeg_4
|
||||
libpng
|
||||
libjpeg8
|
||||
curl
|
||||
|
||||
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-uK4HWC+uGiey+K0p8+Wi+Pi+U7b4k09b8iKF9BmTPcc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-5paHSrqU8tItD/CAbauj6KcW/mKsveOAfXjD/NUuFAc=";
|
||||
cargoHash = "sha256-5paHSrqU8tItD/CAbauj6KcW/mKsveOAfXjD/NUuFAc=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-6jtUNhib6iveuZ7qUKK7AllyMKFpZ8OUUaIieFqseY8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-SLOiX8z8LuQ9VA/lg0lOhqs85MGs0vmeP74cS6sgghI=";
|
||||
cargoHash = "sha256-SLOiX8z8LuQ9VA/lg0lOhqs85MGs0vmeP74cS6sgghI=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
postFixup = ''
|
||||
|
||||
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-ZA1q1YVJcdSUF9NTikyT3vrRnqbsu5plzRI2gMu+qnQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-6ZhWStZebXSwrej36DXifrsrmR1SWW3PwGUX0hqPwE4=";
|
||||
cargoHash = "sha256-6ZhWStZebXSwrej36DXifrsrmR1SWW3PwGUX0hqPwE4=";
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Foundation ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
|
||||
--replace '/usr/bin/gnome-terminal' 'gnome-terminal'
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-cTvrq0fH057UIx/O9u8zHMsg+psMGg1q9klV5OMxtok=";
|
||||
cargoHash = "sha256-cTvrq0fH057UIx/O9u8zHMsg+psMGg1q9klV5OMxtok=";
|
||||
|
||||
cargoBuildFlags = [ "--package" "pop-launcher-bin" ];
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-mEmtLCtHlrCurjKKJ3vEtEkLBik4LwuUED5UeQ1QLws=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-lgVByl+mpCDbhwlC1Eiw9ZkHIDYJsOR06Ds790pXOMc=";
|
||||
cargoHash = "sha256-lgVByl+mpCDbhwlC1Eiw9ZkHIDYJsOR06Ds790pXOMc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "07xsrc0w0z7w2w0q44aqnn1ybf9vqry01v3xr96l1xzzc5mkqdzf";
|
||||
};
|
||||
|
||||
cargoSha256 = "0y94dywligcsqs01d228w454ssrzg31p4j8mni9flcr4v29z3rwp";
|
||||
cargoHash = "sha256-l+fxk9gkM+pStBVJcsN4P2tNCuFIiBaAxpq9SLlvJHk=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ]
|
||||
|
||||
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoPatches = [ ./fix-cargo-lock.patch ];
|
||||
|
||||
cargoSha256 = "sha256-8J92WtMmCTnghPqSmNYhG3IVdmpHsHEH7Fkod0UYKJU=";
|
||||
cargoHash = "sha256-8J92WtMmCTnghPqSmNYhG3IVdmpHsHEH7Fkod0UYKJU=";
|
||||
|
||||
# Tests require network access
|
||||
doCheck = false;
|
||||
|
||||
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
||||
rich
|
||||
shellingham
|
||||
typer
|
||||
] ++ typer.optional-dependencies.all;
|
||||
];
|
||||
|
||||
# No tests available
|
||||
doCheck = false;
|
||||
|
||||
@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-qGcEhoytkCkcaA5eHc8GVgWvbOIyrO6BCp+EHva6wTw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-a7ADTJ0VmKiZBr951JIAOSPWucsBl5JnM8eQHWssRM4=";
|
||||
cargoHash = "sha256-a7ADTJ0VmKiZBr951JIAOSPWucsBl5JnM8eQHWssRM4=";
|
||||
|
||||
checkFlags = [
|
||||
# Fails for 1.6.0, but binary works fine
|
||||
|
||||
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "0aryfx9qlnjdq3iq2d823c82fhkafvibmbz58g48b8ah5x5fv3ir";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-gEpmXyLmw6bX3enA3gNVtXNMlkQl6J/8AwJQSY0RtFw=";
|
||||
cargoHash = "sha256-gEpmXyLmw6bX3enA3gNVtXNMlkQl6J/8AwJQSY0RtFw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Typing tui with visualized results and historical logging";
|
||||
|
||||
@ -27,10 +27,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-QLKLqTCpVMWxlDINa8Bo1vgCDcjwovoaXUs/PdMnxv0=";
|
||||
};
|
||||
|
||||
# Meson doesn't find boost without these
|
||||
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
|
||||
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
|
||||
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
makeWrapper
|
||||
|
||||
@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "11w86k1w5zryiq6bqr98pjhffd3l76377yz53qx0n76vc5374fk9";
|
||||
};
|
||||
|
||||
cargoSha256 = "18v7agm39acnblc703278cn8py5971hm8p5kxmznpw119fjp36s5";
|
||||
cargoHash = "sha256-RZtxpUsh8Gt/7bNcVGE4qfiLLENHDHAYXZapNOpTZ6M=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Small tool to display Znodes in Zookeeper in tree structure";
|
||||
|
||||
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-+rj6P3ejc4Qb/uqbf3N9MqyqDT7yg9JFE0yfW/uzd6M=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-XrFpvH3qiMvpgbH7Q+KC1zFAqJT4rjxux6Q5KLY2ufI=";
|
||||
cargoHash = "sha256-XrFpvH3qiMvpgbH7Q+KC1zFAqJT4rjxux6Q5KLY2ufI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -62,7 +62,7 @@
|
||||
|
||||
# For Vulkan support (--enable-features=Vulkan); disabled by default as it seems to break VA-API
|
||||
, vulkanSupport ? false
|
||||
, addOpenGLRunpath
|
||||
, addDriverRunpath
|
||||
, enableVulkan ? vulkanSupport
|
||||
}:
|
||||
|
||||
@ -187,7 +187,7 @@ stdenv.mkDerivation {
|
||||
''}
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}"
|
||||
${optionalString vulkanSupport ''
|
||||
--prefix XDG_DATA_DIRS : "${addOpenGLRunpath.driverLink}/share"
|
||||
--prefix XDG_DATA_DIRS : "${addDriverRunpath.driverLink}/share"
|
||||
''}
|
||||
--add-flags ${escapeShellArg commandLineArgs}
|
||||
)
|
||||
|
||||
@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-yYLDbxmUR86fdpbHQQTiHVUbicnOD75cl3Vhofw5qr0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-AHhKfy2AAcDBcknzNb8DAzm51RQqFQDuWN+Hp5731Yk=";
|
||||
cargoHash = "sha256-AHhKfy2AAcDBcknzNb8DAzm51RQqFQDuWN+Hp5731Yk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-J+ka7/B37WzVPPE2Krkd/TIiVwuKfI2QYWmT0JHgBGQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-y3Y5PnZ51Zc3LmVTijUGnb0KaGm28sWOSYxjuM3A1Zk=";
|
||||
cargoHash = "sha256-y3Y5PnZ51Zc3LmVTijUGnb0KaGm28sWOSYxjuM3A1Zk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config scdoc which ];
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ addOpenGLRunpath
|
||||
{ addDriverRunpath
|
||||
, alsa-lib
|
||||
, at-spi2-atk
|
||||
, at-spi2-core
|
||||
@ -179,7 +179,7 @@ stdenv.mkDerivation {
|
||||
# FIXME: Add back NIXOS_OZONE_WL support once upstream fixes the crash on native Wayland (see #318035)
|
||||
wrapProgram $executable \
|
||||
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
|
||||
--prefix LD_LIBRARY_PATH : ${rpath}:$out/opt/bytedance/feishu:${addOpenGLRunpath.driverLink}/share \
|
||||
--prefix LD_LIBRARY_PATH : ${rpath}:$out/opt/bytedance/feishu:${addDriverRunpath.driverLink}/share \
|
||||
${lib.optionalString (commandLineArgs!="") "--add-flags ${lib.escapeShellArg commandLineArgs}"}
|
||||
done
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
, fixup-yarn-lock
|
||||
, python3
|
||||
, npmHooks
|
||||
, darwin
|
||||
, cctools
|
||||
, sqlite
|
||||
, srcOnly
|
||||
, buildPackages
|
||||
@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-MM6SgVT7Pjdu96A4eWRucEzT7uNPxBqUDgHKl8mH2C0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin darwin.cctools;
|
||||
nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin cctools;
|
||||
buildInputs = [ sqlite ];
|
||||
|
||||
configurePhase = ''
|
||||
|
||||
@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-FtRPRR+/R3JTEI90mAEHFyhqloAbNEdR3jkquKa9Ahw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-yjRbg/GzCs5d3zXL22j5U9c4BlOcRHyggHCovj4fMIs=";
|
||||
cargoHash = "sha256-yjRbg/GzCs5d3zXL22j5U9c4BlOcRHyggHCovj4fMIs=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to list listening sockets";
|
||||
|
||||
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-Qb9fEPQrdn+Ek9bdOMfaPIxlGGpQ9RfQZOeeqoOf17E=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-nnAYjutjxtEpDNoWTnlESDO4Haz14wZxY4gdyzdLgBU=";
|
||||
cargoHash = "sha256-nnAYjutjxtEpDNoWTnlESDO4Haz14wZxY4gdyzdLgBU=";
|
||||
|
||||
buildInputs = [
|
||||
notmuch
|
||||
|
||||
@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-KrvTwcIeINIBkia6PTnKXp4jFd6GEMBh/xbn0Ot/wmE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Zft/ip+/uJbUIqCDDEa4hchmZZiYWGdaVnzWC74FgU8=";
|
||||
cargoHash = "sha256-Zft/ip+/uJbUIqCDDEa4hchmZZiYWGdaVnzWC74FgU8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
diff -rup rsync-3.2.7/configure.sh rsync-3.2.7-fixed/configure.sh
|
||||
--- rsync-3.2.7/configure.sh 2022-10-20 17:57:22
|
||||
+++ rsync-3.2.7-fixed/configure.sh 2024-01-01 19:51:58
|
||||
@@ -7706,7 +7706,7 @@ else $as_nop
|
||||
#include <stdlib.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
-main()
|
||||
+int main()
|
||||
{
|
||||
if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
|
||||
exit(1);
|
||||
@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook perl ];
|
||||
|
||||
patches = [
|
||||
# https://github.com/WayneD/rsync/pull/558
|
||||
./configure.ac-fix-failing-IPv6-check.patch
|
||||
];
|
||||
|
||||
buildInputs = [ libiconv zlib popt ]
|
||||
++ lib.optional enableACLs acl
|
||||
++ lib.optional enableZstd zstd
|
||||
@ -39,6 +44,10 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional enableXXHash xxHash;
|
||||
|
||||
configureFlags = [
|
||||
(lib.enableFeature enableLZ4 "lz4")
|
||||
(lib.enableFeature enableOpenSSL "openssl")
|
||||
(lib.enableFeature enableXXHash "xxhash")
|
||||
(lib.enableFeature enableZstd "zstd")
|
||||
"--with-nobody-group=nogroup"
|
||||
|
||||
# disable the included zlib explicitly as it otherwise still compiles and
|
||||
@ -47,14 +56,6 @@ stdenv.mkDerivation rec {
|
||||
] ++ lib.optionals (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64) [
|
||||
# fix `multiversioning needs 'ifunc' which is not supported on this target` error
|
||||
"--disable-roll-simd"
|
||||
] ++ lib.optionals (!enableZstd) [
|
||||
"--disable-zstd"
|
||||
] ++ lib.optionals (!enableXXHash) [
|
||||
"--disable-xxhash"
|
||||
] ++ lib.optionals (!enableLZ4) [
|
||||
"--disable-lz4"
|
||||
] ++ lib.optionals (!enableOpenSSL) [
|
||||
"--disable-openssl"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256:04k0maxy39k7qzcsqsv1byddsmjszmnyjffrf22nzbvml83p3l0y";
|
||||
};
|
||||
|
||||
cargoSha256 = "1nlzhkhk1y0jhj6n3wn4dm783ldsxn7dk0d2xjx6ylczf9z3gp12";
|
||||
cargoHash = "sha256-Itw3fnKfUW+67KKB2Y7tutGBTm3E8mGNhBL4MOGEn9o=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
postInstall = ''
|
||||
|
||||
@ -41,10 +41,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
#link-time optimization fails on darwin
|
||||
#see https://github.com/NixOS/nixpkgs/issues/19098
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-lto";
|
||||
|
||||
postPatch = ''
|
||||
# Fix gcc-13 build failure due to missing includes:
|
||||
sed -e '1i #include <cstdint>' -i \
|
||||
|
||||
@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-JzOD0QQfDfIkJQATxGpyJBrFg5l6lkkAXY2qv9bir3c=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1z51yx3psdxdzmwny0rzlch5hjx2pssll73q79qij2bc7wgyjscy";
|
||||
cargoHash = "sha256-nmnpHz9sCRlxOngcSrW+oktYIKM/A295/a03fUf3ofw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple digital waveform viewer with vi-like key bindings";
|
||||
|
||||
@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-bnRzXIYairlBjv2JxU16UXYc5BB3VeKZNiJ4+XDzub4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-C/D9EPfifyajrCyXE8w/qRuzWEoyJJIcj4xii94/9l4=";
|
||||
cargoHash = "sha256-C/D9EPfifyajrCyXE8w/qRuzWEoyJJIcj4xii94/9l4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-suzivynlgk4VvDOC2dQR40n5IJHoJ736+ObdrM9dIqE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-HekjmctuzOWs5k/ihhsV8vVkm6906jEnFf3yvhkrA5Y=";
|
||||
cargoHash = "sha256-HekjmctuzOWs5k/ihhsV8vVkm6906jEnFf3yvhkrA5Y=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ addOpenGLRunpath
|
||||
{ addDriverRunpath
|
||||
, autoPatchelfHook
|
||||
, lib
|
||||
, makeWrapper
|
||||
@ -57,7 +57,7 @@ let cudaEnv = symlinkJoin {
|
||||
];
|
||||
postBuild = ''
|
||||
if [ ! -e $out/lib/libcuda.so ]; then
|
||||
ln -s ${addOpenGLRunpath.driverLink}/lib/libcuda.so $out/lib
|
||||
ln -s ${addDriverRunpath.driverLink}/lib/libcuda.so $out/lib
|
||||
fi
|
||||
ln -s lib $out/lib64
|
||||
'';
|
||||
@ -69,7 +69,7 @@ in stdenv.mkDerivation {
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
makeWrapper
|
||||
] ++ lib.optional cudaSupport addOpenGLRunpath;
|
||||
] ++ lib.optional cudaSupport addDriverRunpath;
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
@ -136,8 +136,8 @@ in stdenv.mkDerivation {
|
||||
"--set QT_QPA_PLATFORM wayland;xcb"
|
||||
] ++ lib.optionals cudaSupport [
|
||||
"--set CUDA_PATH ${cudaEnv}"
|
||||
"--set NVIDIA_DRIVER_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib/libnvidia-tls.so"
|
||||
"--set CUDA_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib/libcuda.so"
|
||||
"--set NVIDIA_DRIVER_LIBRARY_PATH ${addDriverRunpath.driverLink}/lib/libnvidia-tls.so"
|
||||
"--set CUDA_LIBRARY_PATH ${addDriverRunpath.driverLink}/lib/libcuda.so"
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@ -24,7 +24,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||
--replace '"schema-salad >= 8.4.20230426093816, < 9",' "" \
|
||||
--replace "PYTEST_RUNNER + " ""
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml"
|
||||
--replace "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml" \
|
||||
--replace "mypy==1.10.0" "mypy==1.10.*"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "EYzhb9jJ4MzHxIbaTb1MxeXUgoxTwcnq5JdxAv2uNcA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "AeHQCoP1HOftlOt/Yala3AXocMlwwIXIO2i1AsFSvGQ=";
|
||||
cargoHash = "sha256-AeHQCoP1HOftlOt/Yala3AXocMlwwIXIO2i1AsFSvGQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI tool to help you write git commit";
|
||||
|
||||
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-IPSxVWJs4EhyBdA1NXpD8v3fusewt1ELpn/kbZt7c5Q=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-eK+oQbOQj8pKiOTXzIgRjzVB7Js8MMa9V6cF9D98Ftc=";
|
||||
cargoHash = "sha256-eK+oQbOQj8pKiOTXzIgRjzVB7Js8MMa9V6cF9D98Ftc=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "0bzq4ridzb4l1zqrj1r0vlzkjpgfaqwky5jf49cwjhz4ybwrfpkq";
|
||||
};
|
||||
|
||||
cargoSha256 = "00wi64v2zn8rp8fjwbdwyvl3pva5sn9xclaawp2m222dqnlszb2d";
|
||||
cargoHash = "sha256-TayvqcVNCFHF5UpR1pPVRe076Pa8LS4duhnZLzYxkQM=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/softprops/git-codeowners";
|
||||
|
||||
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
||||
libiconv
|
||||
];
|
||||
|
||||
cargoSha256 = "sha256-eTAEf2nRrJ7i2Dw5BBZlLLu8mK2G/wUk40ivtfxk1pI=";
|
||||
cargoHash = "sha256-eTAEf2nRrJ7i2Dw5BBZlLLu8mK2G/wUk40ivtfxk1pI=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch";
|
||||
|
||||
@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-9/t2MDZ5bYTuzCYTodeATqk+xqST2aQMr7Z1x5fPIuw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-/drXVkYgdkFqZJsz2fNx3Ms21xYKQmwLXRJEmKSaikQ=";
|
||||
cargoHash = "sha256-/drXVkYgdkFqZJsz2fNx3Ms21xYKQmwLXRJEmKSaikQ=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "10fspcafqnv6if5c1h8z9pf9140jvvlrch88w62wsg4w2vhaii0v";
|
||||
};
|
||||
|
||||
cargoSha256 = "1j0vl3h6f65ldg80bgryh1mz423lcrcdkn8rmajya1850pfxk3w3";
|
||||
cargoHash = "sha256-g4/Z3QUFBeWlqhnZ2VhmdAjya4A+vwXQa7QYZ+CgG8g=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, python3Packages, makeWrapper, gettext, installShellFiles
|
||||
, re2Support ? true
|
||||
# depends on rust-cpython which won't support python312
|
||||
# https://github.com/dgrunwald/rust-cpython/commit/e815555629e557be084813045ca1ddebc2f76ef9
|
||||
, rustSupport ? (stdenv.hostPlatform.isLinux && python3Packages.pythonOlder "3.12"), cargo, rustPlatform, rustc
|
||||
, rustSupport ? stdenv.hostPlatform.isLinux, cargo, rustPlatform, rustc
|
||||
, fullBuild ? false
|
||||
, gitSupport ? fullBuild
|
||||
, guiSupport ? fullBuild, tk
|
||||
@ -19,15 +17,15 @@
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (python3Packages) docutils python fb-re2 pygit2 pygments;
|
||||
inherit (python3Packages) docutils python fb-re2 pygit2 pygments setuptools;
|
||||
|
||||
self = python3Packages.buildPythonApplication rec {
|
||||
pname = "mercurial${lib.optionalString fullBuild "-full"}";
|
||||
version = "6.7.4";
|
||||
version = "6.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
|
||||
hash = "sha256-dHCPhzQFwSJy/sEWxt1Shi6O0RwQARx+V19eqBJj6l4=";
|
||||
hash = "sha256-COTQ5dqK8RMrUea8M1AYCtV63Nk18Je20LwRmiwsChA=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
@ -37,7 +35,7 @@ let
|
||||
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "mercurial-${version}";
|
||||
hash = "sha256-FRa7frX2z9jQGFBXS2TpOUANs0+xwegNETUAQIU0S4o=";
|
||||
hash = "sha256-mP82UtASD0Fh8ilDDCB6ubY7/MGPoRP6hg6/xRwzwAw=";
|
||||
sourceRoot = "mercurial-${version}/rust";
|
||||
} else null;
|
||||
cargoRoot = if rustSupport then "rust" else null;
|
||||
@ -45,7 +43,7 @@ let
|
||||
propagatedBuildInputs = lib.optional re2Support fb-re2
|
||||
++ lib.optional gitSupport pygit2
|
||||
++ lib.optional highlightSupport pygments;
|
||||
nativeBuildInputs = [ makeWrapper gettext installShellFiles python3Packages.setuptools ]
|
||||
nativeBuildInputs = [ makeWrapper gettext installShellFiles setuptools ]
|
||||
++ lib.optionals rustSupport [
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
@ -114,6 +112,9 @@ let
|
||||
gnupg
|
||||
];
|
||||
|
||||
# https://bz.mercurial-scm.org/show_bug.cgi?id=6887
|
||||
propagatedBuildInputs = [ setuptools ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
|
||||
@ -127,6 +128,12 @@ let
|
||||
--replace '*/hg:' '*/*hg*:' \${/* paths emitted by our wrapped hg look like ..hg-wrapped-wrapped */""}
|
||||
--replace '"$PYTHON" "$BINDIR"/hg' '"$BINDIR"/hg' ${/* 'hg' is a wrapper; don't run using python directly */""}
|
||||
done
|
||||
|
||||
# https://bz.mercurial-scm.org/show_bug.cgi?id=6887
|
||||
# Adding setuptools to the python path is not enough for the distutils
|
||||
# module to be found, so we patch usage directly:
|
||||
substituteInPlace tests/hghave.py \
|
||||
--replace-fail "distutils" "setuptools._distutils"
|
||||
'';
|
||||
|
||||
# This runs Mercurial _a lot_ of times.
|
||||
@ -156,6 +163,21 @@ let
|
||||
# Python 3.10-3.12 deprecation warning: asyncore
|
||||
# https://bz.mercurial-scm.org/show_bug.cgi?id=6727
|
||||
test-patchbomb-tls.t
|
||||
|
||||
# Python 3.12 _lsprof module change, breaking profile test
|
||||
# https://bz.mercurial-scm.org/show_bug.cgi?id=6846
|
||||
test-profile.t
|
||||
|
||||
# Python 3.12 deprecation warning: multi-threaded fork in worker.py
|
||||
# https://bz.mercurial-scm.org/show_bug.cgi?id=6892
|
||||
test-clone-stream.t
|
||||
test-clonebundles.t
|
||||
test-fix-topology.t
|
||||
test-fix.t
|
||||
test-persistent-nodemap.t
|
||||
test-profile.t
|
||||
test-simple-update.t
|
||||
|
||||
EOF
|
||||
|
||||
export HGTEST_REAL_HG="${mercurial}/bin/hg"
|
||||
|
||||
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "021vdk5i7yyrnh4apn0gnsh6ycnx15wm3g2jrfsg7fycnq8167wc";
|
||||
};
|
||||
|
||||
cargoSha256 = "0hx5nhxci6p0gjjn1f3vpfykq0f7hdvhlv8898vrv0lh5r9hybsn";
|
||||
cargoHash = "sha256-Vi8PUy6Qgp03SghtCneDxwE8vbt7uGClfOCayDq0pUM=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-M3Utrt350I67kqzEH130tgBIiI7rY8ODCSxgMohWWWM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-urnTPlQTmOPq7mHZjsTqxql/FQe7NYHE8sVJJ4fno+U=";
|
||||
cargoHash = "sha256-urnTPlQTmOPq7mHZjsTqxql/FQe7NYHE8sVJJ4fno+U=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple Git/Mercurial/PlasticSCM tui client based on keyboard shortcuts";
|
||||
|
||||
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-q1IV9TtmznpR7RO75iN0p16nmTja5ADWqFj58EOPWvU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-6swIoVp1B4CMvaGvq868LTKkzpI6zFKJNgUVqjdyH20=";
|
||||
cargoHash = "sha256-6swIoVp1B4CMvaGvq868LTKkzpI6zFKJNgUVqjdyH20=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, runCommandLocal
|
||||
, unzip
|
||||
, appimage-run
|
||||
, addOpenGLRunpath
|
||||
, addDriverRunpath
|
||||
, dbus
|
||||
, libGLU
|
||||
, xorg
|
||||
@ -38,7 +38,7 @@ let
|
||||
|
||||
nativeBuildInputs = [
|
||||
(appimage-run.override { buildFHSEnv = buildFHSEnvChroot; } )
|
||||
addOpenGLRunpath
|
||||
addDriverRunpath
|
||||
copyDesktopItems
|
||||
unzip
|
||||
];
|
||||
@ -150,14 +150,14 @@ let
|
||||
postFixup = ''
|
||||
for program in $out/bin/*; do
|
||||
isELF "$program" || continue
|
||||
addOpenGLRunpath "$program"
|
||||
addDriverRunpath "$program"
|
||||
done
|
||||
|
||||
for program in $out/libs/*; do
|
||||
isELF "$program" || continue
|
||||
if [[ "$program" != *"libcudnn_cnn_infer"* ]];then
|
||||
echo $program
|
||||
addOpenGLRunpath "$program"
|
||||
addDriverRunpath "$program"
|
||||
fi
|
||||
done
|
||||
ln -s $out/libs/libcrypto.so.1.1 $out/libs/libcrypt.so.1
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
SDL2,
|
||||
addOpenGLRunpath,
|
||||
addDriverRunpath,
|
||||
alsa-lib,
|
||||
bash,
|
||||
buildPackages,
|
||||
@ -203,7 +203,7 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
addOpenGLRunpath
|
||||
addDriverRunpath
|
||||
docutils # for rst2man
|
||||
meson
|
||||
ninja
|
||||
@ -329,9 +329,9 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
# Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found.
|
||||
# See the explanation in addOpenGLRunpath.
|
||||
# See the explanation in addDriverRunpath.
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
addOpenGLRunpath $out/bin/mpv
|
||||
addDriverRunpath $out/bin/mpv
|
||||
patchShebangs --update --host $out/bin/umpv $out/bin/mpv_identify.sh
|
||||
'';
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, nv-codec-headers-12
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, addOpenGLRunpath
|
||||
, addDriverRunpath
|
||||
, cmake
|
||||
, fdk_aac
|
||||
, ffmpeg
|
||||
@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
addOpenGLRunpath
|
||||
addDriverRunpath
|
||||
cmake
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
@ -184,8 +184,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
addOpenGLRunpath $out/lib/lib*.so
|
||||
addOpenGLRunpath $out/lib/obs-plugins/*.so
|
||||
addDriverRunpath $out/lib/lib*.so
|
||||
addDriverRunpath $out/lib/obs-plugins/*.so
|
||||
|
||||
# Link libcef again after patchelfing other libs
|
||||
ln -s ${libcef}/lib/* $out/lib/obs-plugins/
|
||||
|
||||
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-TOcK+l65iKON1kgBE4DYV/BXACnvqPCshavnVdpnGH4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-tOY3aLpU08Tg/IT+usS2DNO0Q1aD0bvURmNJmHcJkgI=";
|
||||
cargoHash = "sha256-tOY3aLpU08Tg/IT+usS2DNO0Q1aD0bvURmNJmHcJkgI=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, addOpenGLRunpath
|
||||
, addDriverRunpath
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, elfutils
|
||||
@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postInstall =
|
||||
let
|
||||
inherit (addOpenGLRunpath) driverLink;
|
||||
inherit (addDriverRunpath) driverLink;
|
||||
libraryPath = lib.makeLibraryPath [ "$out" driverLink "${driverLink}-32" ];
|
||||
in
|
||||
''
|
||||
|
||||
@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-hKk5pcop8rb5Q+IVchcl+XhMc3DCBBPn5P+AkAb9XxI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-edi6/Md6KebKM3wHArZe1htUCg0/BqMVZKA4xEH25GI=";
|
||||
cargoHash = "sha256-edi6/Md6KebKM3wHArZe1htUCg0/BqMVZKA4xEH25GI=";
|
||||
|
||||
# lld: error: unknown argument '-Wl,--undefined=AUDITABLE_VERSION_INFO'
|
||||
# https://github.com/cloud-hypervisor/rust-hypervisor-firmware/issues/249
|
||||
|
||||
@ -38,10 +38,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ]
|
||||
++ lib.optional enableSDL "USE_SDL=2" # Use SDL2 instead of SDL1
|
||||
++ lib.optional (!enableSDL && !enableX11) "USE_FB=0"
|
||||
|
||||
# work around https://github.com/NixOS/nixpkgs/issues/19098
|
||||
++ lib.optional (stdenv.cc.isClang && stdenv.isDarwin) "CFLAGS=-fno-lto";
|
||||
++ lib.optional (!enableSDL && !enableX11) "USE_FB=0";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/LekKit/RVVM";
|
||||
|
||||
@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-1Ex6ahKBoVRikSqrgHGYaBFzWkPFDm8bGVyB7KmO8tI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-uuZCbmt3eIlKurwMOV7LezVSjOVG/90OdT2PC8YLi3I=";
|
||||
cargoHash = "sha256-uuZCbmt3eIlKurwMOV7LezVSjOVG/90OdT2PC8YLi3I=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
|
||||
nativeBuildInputs = [ makeWrapper pkg-config ];
|
||||
buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ];
|
||||
|
||||
cargoSha256 = "sha256-eRfXUnyzOfVSEiwjLCaNbETUPXVU2Ed2VUNM9FjS5YE=";
|
||||
cargoHash = "sha256-eRfXUnyzOfVSEiwjLCaNbETUPXVU2Ed2VUNM9FjS5YE=";
|
||||
|
||||
postInstall = lib.optionalString (bins != []) ''
|
||||
wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}"
|
||||
|
||||
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-gpVYVyh+2y4Tttvw1SuCf7mx/nxR330Ob2R4UmHZSJs=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-OxQ7S+Sqc3aRH53Bs53Y+EKOYFgboGOBsQ7KJgICcGo=";
|
||||
cargoHash = "sha256-OxQ7S+Sqc3aRH53Bs53Y+EKOYFgboGOBsQ7KJgICcGo=";
|
||||
|
||||
# Currently no tests are implemented, so we avoid building the package twice
|
||||
doCheck = false;
|
||||
|
||||
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "0yfmr5zk2c2il9d31yjjbr48sqgcq6hp4a99hl5mjm2ajyhy5bz3";
|
||||
};
|
||||
|
||||
cargoSha256 = "134sgc9d0j57swknl9sgil6212rws2hhp92s3cg1yzz5ygx21c76";
|
||||
cargoHash = "sha256-5rAg+vPlfx8eG1qkC6HQPIsgDI1PJ2on16dI0BJ7mow=";
|
||||
|
||||
# Currently no tests are implemented, so we avoid building the package twice
|
||||
doCheck = false;
|
||||
|
||||
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-Mq4TpQDiIYePUS3EwBfOe2+QmvF6+WEDK12WahbuhSU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-hybvzHwHM0rQwgZfQpww/w9wQDW5h9P2KSjpAScVTBo=";
|
||||
cargoHash = "sha256-hybvzHwHM0rQwgZfQpww/w9wQDW5h9P2KSjpAScVTBo=";
|
||||
|
||||
nativeBuildInputs = [ python3 ];
|
||||
buildInputs = [ libxcb ];
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
{ lib, stdenv }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "add-opengl-runpath";
|
||||
|
||||
driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32";
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out/nix-support
|
||||
substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook
|
||||
'';
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user