diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-10 00:02:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-10 00:02:22 +0000 |
| commit | 3f616fad02c82853a8e6e3cf8fd3aea95945f70e (patch) | |
| tree | 13ae002b9f9ee17c56db234f89ae5585b505b16c /pkgs/applications/version-management | |
| parent | e112f9b8bbb5af9de4426046a7cb4490e2c12eb0 (diff) | |
| parent | 2251d8ffde6ad42897b7c97c51e117a2c6ec7f23 (diff) | |
| download | nixlib-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar nixlib-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar.gz nixlib-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar.bz2 nixlib-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar.lz nixlib-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar.xz nixlib-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar.zst nixlib-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/josh/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/josh/default.nix b/pkgs/applications/version-management/josh/default.nix index a9929cca64e4..5acd1a634344 100644 --- a/pkgs/applications/version-management/josh/default.nix +++ b/pkgs/applications/version-management/josh/default.nix @@ -30,6 +30,14 @@ rustPlatform.buildRustPackage rec { 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"; diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 6f03b139cf1b..ecb5093f4be1 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -114,6 +114,7 @@ let description = "A version control system intended to be a compelling replacement for CVS in the open source community"; license = licenses.asl20; homepage = "https://subversion.apache.org/"; + mainProgram = "svn"; maintainers = with maintainers; [ eelco lovek323 ]; platforms = platforms.linux ++ platforms.darwin; }; |