2021-04-10 18:05:16 +02:00
|
|
|
# This overlay is used to make TVL-specific modifications in the
|
|
|
|
# nixpkgs tree, where required.
|
2023-09-26 08:50:23 +02:00
|
|
|
{ lib, depot, localSystem, ... }:
|
2021-04-10 18:05:16 +02:00
|
|
|
|
2022-04-21 14:08:12 +02:00
|
|
|
self: super:
|
2022-04-21 14:14:37 +02:00
|
|
|
depot.nix.readTree.drvTargets {
|
2023-12-06 08:12:14 +01:00
|
|
|
nix_2_3 = (super.nix_2_3.override {
|
|
|
|
# flaky tests, long painful build, see https://github.com/NixOS/nixpkgs/pull/266443
|
|
|
|
withAWS = false;
|
|
|
|
});
|
2022-11-10 14:41:46 +01:00
|
|
|
nix = self.nix_2_3;
|
2023-12-06 08:12:14 +01:00
|
|
|
nix_latest = super.nix.override ({
|
|
|
|
# flaky tests, long painful build, see https://github.com/NixOS/nixpkgs/pull/266443
|
|
|
|
withAWS = false;
|
|
|
|
});
|
2022-10-19 16:22:38 +02:00
|
|
|
|
2023-09-19 22:41:41 +02:00
|
|
|
# To match telega in emacs-overlay or wherever
|
2023-02-18 21:04:06 +01:00
|
|
|
tdlib = super.tdlib.overrideAttrs (_: {
|
2024-02-12 17:12:17 +01:00
|
|
|
version = "1.8.24";
|
2023-02-18 21:04:06 +01:00
|
|
|
src = self.fetchFromGitHub {
|
|
|
|
owner = "tdlib";
|
|
|
|
repo = "td";
|
2024-02-12 17:12:17 +01:00
|
|
|
rev = "d79bd4b69403868897496da39b773ab25c69f6af";
|
|
|
|
sha256 = "0bc5akzw12qwj45rzqkrhw65qlrn9q8pzmvc5aiqv4bvhkb1ghl0";
|
2023-02-18 21:04:06 +01:00
|
|
|
};
|
2023-01-18 19:39:28 +01:00
|
|
|
});
|
|
|
|
|
2022-10-26 15:39:00 +02:00
|
|
|
home-manager = super.home-manager.overrideAttrs (_: {
|
|
|
|
src = depot.third_party.sources.home-manager;
|
|
|
|
version = "git-"
|
|
|
|
+ builtins.substring 0 7 depot.third_party.sources.home-manager.rev;
|
|
|
|
});
|
|
|
|
|
2021-04-14 00:11:02 +02:00
|
|
|
# Add our Emacs packages to the fixpoint
|
|
|
|
emacsPackagesFor = emacs: (
|
2024-02-12 17:12:17 +01:00
|
|
|
(super.emacsPackagesFor emacs).overrideScope (eself: esuper: {
|
2021-04-14 00:11:02 +02:00
|
|
|
tvlPackages = depot.tools.emacs-pkgs // depot.third_party.emacs;
|
2021-09-01 12:14:37 +02:00
|
|
|
|
|
|
|
# Use the notmuch from nixpkgs instead of from the Emacs
|
|
|
|
# overlay, to avoid versions being out of sync.
|
|
|
|
notmuch = super.notmuch.emacs;
|
2021-09-15 21:46:17 +02:00
|
|
|
|
|
|
|
# Build EXWM with the depot sources instead.
|
2023-11-16 09:18:10 +01:00
|
|
|
depotExwm = eself.callPackage depot.third_party.exwm.override { };
|
2022-02-26 12:35:45 +01:00
|
|
|
|
|
|
|
# Workaround for magit checking the git version at load time
|
|
|
|
magit = esuper.magit.overrideAttrs (_: {
|
|
|
|
propagatedNativeBuildInputs = [
|
|
|
|
self.git
|
|
|
|
];
|
|
|
|
});
|
2024-02-06 08:03:20 +01:00
|
|
|
|
|
|
|
# Pin xelb to a newer one until the new maintainers do a release.
|
|
|
|
xelb = eself.trivialBuild {
|
|
|
|
pname = "xelb";
|
|
|
|
version = "0.19-dev"; # invented version, last actual release was 0.18
|
|
|
|
|
|
|
|
src = self.fetchFromGitHub {
|
|
|
|
owner = "emacs-exwm";
|
|
|
|
repo = "xelb";
|
|
|
|
rev = "86089eba2de6c818bfa2fac075cb7ad876262798";
|
|
|
|
sha256 = "1mmlrd2zpcwiv8gh10y7lrpflnbmsycdascrxjr3bfcwa8yx7901";
|
|
|
|
};
|
|
|
|
};
|
2021-04-14 00:11:02 +02:00
|
|
|
})
|
|
|
|
);
|
2021-08-04 16:49:09 +02:00
|
|
|
|
2021-09-01 12:07:11 +02:00
|
|
|
# dottime support for notmuch
|
2022-01-30 17:06:58 +01:00
|
|
|
notmuch = super.notmuch.overrideAttrs (old: {
|
2021-08-04 16:49:09 +02:00
|
|
|
passthru = old.passthru // {
|
2021-09-01 12:07:11 +02:00
|
|
|
patches = old.patches ++ [ ./patches/notmuch-dottime.patch ];
|
2021-08-04 16:49:09 +02:00
|
|
|
};
|
|
|
|
});
|
2021-09-11 15:59:52 +02:00
|
|
|
|
2021-11-21 21:52:03 +01:00
|
|
|
# nix-serve does not work with nix 2.4
|
|
|
|
# https://github.com/edolstra/nix-serve/issues/28
|
2023-03-01 15:15:11 +01:00
|
|
|
nix-serve = super.nix-serve.override { nix = self.nix_2_3; };
|
2021-12-15 13:13:57 +01:00
|
|
|
|
|
|
|
# Avoid builds of mkShell derivations in CI.
|
2022-02-02 11:41:48 +01:00
|
|
|
mkShell = super.lib.makeOverridable (args: (super.mkShell args).overrideAttrs (_: {
|
|
|
|
passthru = {
|
|
|
|
meta.ci.skip = true;
|
|
|
|
};
|
|
|
|
}));
|
2022-12-16 14:13:53 +01:00
|
|
|
|
2024-03-19 17:17:56 +01:00
|
|
|
# Upstreamed in https://github.com/NixOS/nixpkgs/pull/298044,
|
|
|
|
# can be reduced to just the patch on the next nixpkgs bump.
|
|
|
|
cbtemulator = super.buildGoModule rec {
|
|
|
|
pname = "cbtemulator";
|
|
|
|
version = "1.22.0";
|
|
|
|
|
|
|
|
src = (super.fetchFromGitHub {
|
|
|
|
owner = "googleapis";
|
|
|
|
repo = "google-cloud-go";
|
|
|
|
rev = "bigtable/v${version}";
|
|
|
|
hash = "sha256-eOi4QFthnmZb5ry/5L7wzr4Fy1pF/H07BzxOnXtmSu4=";
|
|
|
|
}) + "/bigtable";
|
|
|
|
|
|
|
|
vendorHash = "sha256-7M7YZfl0usjN9hLGozqJV2bGh+M1ec4PZRGYUhEckpY=";
|
|
|
|
subPackages = [ "cmd/emulator" ];
|
|
|
|
|
|
|
|
patches = [
|
|
|
|
(super.fetchpatch {
|
|
|
|
url = "https://github.com/googleapis/google-cloud-go/pull/9665/commits/7b716627fae4d8b28f175eff968090d27d4477eb.patch";
|
|
|
|
hash = "sha256-nEVB7DjafByGHspfDYPcCRHMVHBjeSQ5MBVd6eeo4ls=";
|
|
|
|
stripLen = 1;
|
|
|
|
})
|
|
|
|
(super.fetchpatch {
|
|
|
|
url = "https://github.com/googleapis/google-cloud-go/pull/9665/commits/a65bc68f49bd340040f836e890f1fd4d781f6f2a.patch";
|
|
|
|
hash = "sha256-Zu1JXym+IK9pWp7HKJiGUv2HG776hUat8Qlty9/PsQs=";
|
|
|
|
stripLen = 1;
|
|
|
|
})
|
|
|
|
];
|
|
|
|
|
|
|
|
postInstall = ''
|
|
|
|
mv $out/bin/emulator $out/bin/cbtemulator
|
|
|
|
'';
|
|
|
|
|
|
|
|
meta = with lib; {
|
|
|
|
description = "In-memory Google Cloud Bigtable server";
|
|
|
|
homepage = "https://github.com/googleapis/google-cloud-go/blob/bigtable/v1.22.0/bigtable/cmd/emulator/cbtemulator.go";
|
|
|
|
license = licenses.asl20;
|
|
|
|
maintainers = [ maintainers.flokli ];
|
|
|
|
mainProgram = "cbtemulator";
|
|
|
|
platforms = platforms.all;
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
2024-01-14 18:18:33 +01:00
|
|
|
crate2nix = super.rustPlatform.buildRustPackage rec {
|
|
|
|
pname = "crate2nix";
|
|
|
|
version = "0.13.0";
|
|
|
|
|
|
|
|
src = super.fetchFromGitHub {
|
|
|
|
owner = "nix-community";
|
|
|
|
repo = "crate2nix";
|
|
|
|
rev = "ceb06eb7e76afb9e01a5f069aae136f97df72730";
|
|
|
|
hash = "sha256-JTMe8GViCQt51WUiaaoIPmWtwEeeYrl6pBxo2DNuKig=";
|
|
|
|
};
|
|
|
|
|
2024-02-16 11:41:44 +01:00
|
|
|
patches = [
|
|
|
|
./patches/crate2nix-tests-debug.patch
|
|
|
|
./patches/crate2nix-run-tests-in-build-source.patch
|
|
|
|
];
|
2024-01-16 21:00:41 +01:00
|
|
|
|
2024-01-14 18:18:33 +01:00
|
|
|
sourceRoot = "${src.name}/crate2nix";
|
|
|
|
|
|
|
|
cargoHash = "sha256-dhlSXY1CJE+JJt+6Y7W1MVMz36nwr6ny543py1TcjyY=";
|
|
|
|
|
|
|
|
nativeBuildInputs = [ super.makeWrapper ];
|
|
|
|
|
|
|
|
# Tests use nix(1), which tries (and fails) to set up /nix/var inside the
|
|
|
|
# sandbox
|
|
|
|
doCheck = false;
|
|
|
|
|
|
|
|
postFixup = ''
|
|
|
|
wrapProgram $out/bin/crate2nix \
|
|
|
|
--suffix PATH ":" ${lib.makeBinPath (with self; [ cargo nix_latest nix-prefetch-git ])}
|
|
|
|
|
|
|
|
rm -rf $out/lib $out/bin/crate2nix.d
|
|
|
|
mkdir -p \
|
|
|
|
$out/share/bash-completion/completions \
|
|
|
|
$out/share/zsh/vendor-completions
|
|
|
|
$out/bin/crate2nix completions -s 'bash' -o $out/share/bash-completion/completions
|
|
|
|
$out/bin/crate2nix completions -s 'zsh' -o $out/share/zsh/vendor-completions
|
|
|
|
'';
|
|
|
|
};
|
2023-10-08 11:15:07 +02:00
|
|
|
|
|
|
|
evans = super.evans.overrideAttrs (old: {
|
|
|
|
patches = old.patches or [ ] ++ [
|
|
|
|
# add support for unix domain sockets
|
|
|
|
# https://github.com/ktr0731/evans/pull/680
|
|
|
|
./patches/evans-add-support-for-unix-domain-sockets.patch
|
|
|
|
];
|
|
|
|
});
|
2023-10-20 14:18:02 +02:00
|
|
|
|
2024-03-14 07:43:37 +01:00
|
|
|
# Imports a patch that fixes usage of this package on versions
|
|
|
|
# >=1.9. The patch has been proposed upstream, but so far with no
|
|
|
|
# reactions from the maintainer:
|
|
|
|
#
|
|
|
|
# https://github.com/tpm2-software/tpm2-pkcs11/pull/849
|
|
|
|
tpm2-pkcs11 = super.tpm2-pkcs11.overrideAttrs (old: {
|
|
|
|
patches = (old.patches or [ ]) ++ [ ./patches/tpm2-pkcs11-190-dbupgrade.patch ];
|
|
|
|
});
|
2021-04-10 18:05:16 +02:00
|
|
|
}
|