mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
14eaf39d49
Our josh builds broke on staging with the new rustc 1.73: https://hydra.nixos.org/build/239619692/log/tail This commit cherry-picks the fix (already merged upstream) https://github.com/josh-project/josh/pull/1290
80 lines
1.9 KiB
Nix
80 lines
1.9 KiB
Nix
{ lib
|
|
, stdenv
|
|
, fetchFromGitHub
|
|
, fetchpatch
|
|
, rustPlatform
|
|
, libgit2
|
|
, openssl
|
|
, pkg-config
|
|
, makeWrapper
|
|
, git
|
|
, darwin
|
|
}:
|
|
|
|
rustPlatform.buildRustPackage rec {
|
|
pname = "josh";
|
|
version = "23.02.14";
|
|
JOSH_VERSION = "r${version}";
|
|
|
|
src = fetchFromGitHub {
|
|
owner = "esrlabs";
|
|
repo = "josh";
|
|
rev = JOSH_VERSION;
|
|
sha256 = "1sqa8xi5d55zshky7gicac02f67vp944hclkdsmwy0bczk9hgssr";
|
|
};
|
|
|
|
patches = [
|
|
# Unreleased patch allowing compilation from the GitHub tarball download
|
|
(fetchpatch {
|
|
name = "josh-version-without-git.patch";
|
|
url = "https://github.com/josh-project/josh/commit/13e7565ab029206598881391db4ddc6dface692b.patch";
|
|
sha256 = "1l5syqj51sn7kcqvffwl6ggn5sq8wfkpviga860agghnw5dpf7ns";
|
|
})
|
|
|
|
# Merged upstream, fixes builds with newer rustc
|
|
(fetchpatch {
|
|
name = "josh-fix-builds-with-rust-173.patch";
|
|
url = "https://github.com/josh-project/josh/commit/7b8259b81a9acabb528ddebc4ab30fc712f756fb.patch";
|
|
sha256 = "sha256-YfrVlH6Ox05ZbmB/15HVaFlOyRTOFbYflq0edi6/X9k=";
|
|
includes = [ "josh-proxy/src/bin/josh-proxy.rs" ];
|
|
})
|
|
];
|
|
|
|
cargoSha256 = "0f6cvz2s8qs53b2g6xja38m24hafqla61s4r5za0a1dyndgms7sl";
|
|
|
|
nativeBuildInputs = [
|
|
pkg-config
|
|
makeWrapper
|
|
];
|
|
|
|
buildInputs = [
|
|
libgit2
|
|
openssl
|
|
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
|
darwin.Security
|
|
];
|
|
|
|
cargoBuildFlags = [
|
|
"-p" "josh"
|
|
"-p" "josh-proxy"
|
|
# TODO: josh-ui
|
|
];
|
|
|
|
postInstall = ''
|
|
wrapProgram "$out/bin/josh-proxy" --prefix PATH : "${git}/bin"
|
|
'';
|
|
|
|
meta = {
|
|
description = "Just One Single History";
|
|
homepage = "https://josh-project.github.io/josh/";
|
|
downloadPage = "https://github.com/josh-project/josh";
|
|
changelog = "https://github.com/josh-project/josh/releases/tag/${version}";
|
|
license = lib.licenses.mit;
|
|
maintainers = [
|
|
lib.maintainers.sternenseemann
|
|
lib.maintainers.tazjin
|
|
];
|
|
platforms = lib.platforms.all;
|
|
};
|
|
}
|