mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-29 07:32:58 +00:00
josh: 23.12.04 -> 24.08.14
This bumps josh to the new release, which includes a fix for the Rust 1.80 compilation issue. See https://github.com/NixOS/nixpkgs/issues/332957 for context.
This commit is contained in:
parent
52ab126310
commit
1bd503aa21
@ -13,21 +13,21 @@
|
|||||||
let
|
let
|
||||||
# josh-ui requires javascript dependencies, haven't tried to figure it out yet
|
# josh-ui requires javascript dependencies, haven't tried to figure it out yet
|
||||||
cargoFlags = [ "--workspace" "--exclude" "josh-ui" ];
|
cargoFlags = [ "--workspace" "--exclude" "josh-ui" ];
|
||||||
|
version = "24.08.14";
|
||||||
in
|
in
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage {
|
||||||
pname = "josh";
|
pname = "josh";
|
||||||
version = "23.12.04";
|
inherit version;
|
||||||
JOSH_VERSION = "r${version}";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "esrlabs";
|
owner = "esrlabs";
|
||||||
repo = "josh";
|
repo = "josh";
|
||||||
rev = JOSH_VERSION;
|
rev = "v${version}";
|
||||||
sha256 = "10fspcafqnv6if5c1h8z9pf9140jvvlrch88w62wsg4w2vhaii0v";
|
hash = "sha256-6U1nhERpPQAVgQm6xwRlHIhslYBLd65DomuGn5yRiSs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-g4/Z3QUFBeWlqhnZ2VhmdAjya4A+vwXQa7QYZ+CgG8g=";
|
cargoHash = "sha256-s6+Bd4ucwUinrcbjNvlDsf9LhWc/U9SAvBRW7JAmxVA=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
@ -44,6 +44,9 @@ rustPlatform.buildRustPackage rec {
|
|||||||
cargoBuildFlags = cargoFlags;
|
cargoBuildFlags = cargoFlags;
|
||||||
cargoTestFlags = cargoFlags;
|
cargoTestFlags = cargoFlags;
|
||||||
|
|
||||||
|
# used to teach josh itself about its version number
|
||||||
|
env.JOSH_VERSION = "r${version}";
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
wrapProgram "$out/bin/josh-proxy" --prefix PATH : "${git}/bin"
|
wrapProgram "$out/bin/josh-proxy" --prefix PATH : "${git}/bin"
|
||||||
'';
|
'';
|
||||||
|
Loading…
Reference in New Issue
Block a user