diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2023-03-24 20:33:06 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2023-06-03 11:04:32 +0200 |
| commit | dbb0330c64972a4606c1f6f5203f822b9ee31aa0 (patch) | |
| tree | 0fa10cc99295e1239de0f834608ad51dad597f48 /pkgs/applications/version-management/josh | |
| parent | 789271b2c8a4cc01398316c211b0d597cde8324d (diff) | |
josh: 22.06.22 -> 23.02.14
Diffstat (limited to 'pkgs/applications/version-management/josh')
| -rw-r--r-- | pkgs/applications/version-management/josh/default.nix | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/josh/default.nix b/pkgs/applications/version-management/josh/default.nix index acf2b24c0794e..a9929cca64e47 100644 --- a/pkgs/applications/version-management/josh/default.nix +++ b/pkgs/applications/version-management/josh/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , rustPlatform , libgit2 , openssl @@ -12,16 +13,26 @@ rustPlatform.buildRustPackage rec { pname = "josh"; - version = "22.06.22"; + version = "23.02.14"; + JOSH_VERSION = "r${version}"; src = fetchFromGitHub { owner = "esrlabs"; repo = "josh"; - rev = "r" + version; - sha256 = "0511qv9zyjvv4zfz6zyi69ssbkrwa24n0ah5w9mb4gzd547as8pq"; + rev = JOSH_VERSION; + sha256 = "1sqa8xi5d55zshky7gicac02f67vp944hclkdsmwy0bczk9hgssr"; }; - cargoSha256 = "0zfjjyyz4pxar1mfkkj9aij4dnwqy3asdrmay1iy6ijjn1qd97n4"; + 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"; + }) + ]; + + cargoSha256 = "0f6cvz2s8qs53b2g6xja38m24hafqla61s4r5za0a1dyndgms7sl"; nativeBuildInputs = [ pkg-config |