diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-20 06:01:21 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-20 06:01:21 +0000 |
commit | 0373476c4a69cf435677709fbb94328bd7885e57 (patch) | |
tree | d942d5fc9b3916e793e5d480e6726c6fa52badc8 /pkgs/applications | |
parent | 7495684853151ab456d8b78b5f4ae0e19036dea0 (diff) | |
parent | fa9d6c3d9328e84787451c05170cf816295aa630 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/misc/joshuto/default.nix | 11 | ||||
-rw-r--r-- | pkgs/applications/misc/joshuto/fix-cargo-lock.patch | 11 | ||||
-rw-r--r-- | pkgs/applications/terminal-emulators/wezterm/default.nix | 5 |
3 files changed, 8 insertions, 19 deletions
diff --git a/pkgs/applications/misc/joshuto/default.nix b/pkgs/applications/misc/joshuto/default.nix index 5497d37ef0e13..7d4ec87b9f4bb 100644 --- a/pkgs/applications/misc/joshuto/default.nix +++ b/pkgs/applications/misc/joshuto/default.nix @@ -1,20 +1,17 @@ -{ fetchFromGitHub, lib, rustPlatform, stdenv, SystemConfiguration }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "joshuto"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "kamiyaa"; repo = pname; rev = version; - sha256 = "sha256-+qKOvFoEF/gZL4ijL8lIRWE9ZWJM2eBlk29Lk46jAfQ="; + sha256 = "sha256-9TGHSGYCzU6uAIO4zZ/6+B4oVPE6SD9Phl4dShylW5o="; }; - # upstream includes an outdated Cargo.lock that stops cargo from compiling - cargoPatches = [ ./fix-cargo-lock.patch ]; - - cargoSha256 = "sha256-JlekxU9pMkHNsIcH3+7b2I6MYUlxRqNX+0wwyVrQMAE="; + cargoSha256 = "sha256-g8YYOk2RW4GPdkWlvAxd5KFdV4S1l5yKEzNm9OAc8RI="; buildInputs = lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/pkgs/applications/misc/joshuto/fix-cargo-lock.patch b/pkgs/applications/misc/joshuto/fix-cargo-lock.patch deleted file mode 100644 index 023c824add10e..0000000000000 --- a/pkgs/applications/misc/joshuto/fix-cargo-lock.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -512,7 +512,7 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - - [[package]] - name = "joshuto" --version = "0.9.0" -+version = "0.9.1" - dependencies = [ - "alphanumeric-sort", - "chrono", diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 19e3a1c37e161..0483f5b753a20 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -3,6 +3,7 @@ , lib , fetchFromGitHub , ncurses +, perl , pkg-config , python3 , fontconfig @@ -48,7 +49,7 @@ rustPlatform.buildRustPackage rec { pkg-config python3 ncurses # tic for terminfo - ]; + ] ++ lib.optional stdenv.isDarwin perl; buildInputs = [ fontconfig @@ -102,5 +103,7 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; platforms = platforms.unix; + # Fails on missing UserNotifications framework while linking + broken = stdenv.isDarwin; }; } |