From 4d000fbd2b44d8ee3207afe2f5ad900d90c8ff57 Mon Sep 17 00:00:00 2001 From: Devin Singh Date: Tue, 1 Jun 2021 05:30:10 -0500 Subject: [PATCH] kile-wl: unstable-2021-04-22 -> unstable-2021-06-01 --- pkgs/applications/misc/kile-wl/default.nix | 22 ++- .../misc/kile-wl/update-Cargo-lock.diff | 153 ------------------ 2 files changed, 15 insertions(+), 160 deletions(-) delete mode 100644 pkgs/applications/misc/kile-wl/update-Cargo-lock.diff diff --git a/pkgs/applications/misc/kile-wl/default.nix b/pkgs/applications/misc/kile-wl/default.nix index 479c5bf1d8d1..a9e44964d459 100644 --- a/pkgs/applications/misc/kile-wl/default.nix +++ b/pkgs/applications/misc/kile-wl/default.nix @@ -1,20 +1,28 @@ -{ lib, fetchFromGitLab, rustPlatform }: +{ lib, fetchFromGitLab, unstableGitUpdater, rustPlatform, scdoc }: rustPlatform.buildRustPackage rec { pname = "kile-wl"; - version = "unstable-2021-04-22"; + version = "unstable-2021-06-01"; src = fetchFromGitLab { owner = "snakedye"; repo = "kile"; - rev = "b97b9f1e5b33862b33918efaf23fd1c0c5d7058a"; - sha256 = "sha256-97qJd3o8nJt8IX5tyGWtAmJsIv5Gcw1xoBFwxAqk7I8="; + rev = "28235f85ece148e7010c5d6ac088688100a18e04"; + sha256 = "sha256-UTfYYywOwa728zLkLWQaz6wN0TM/4OzbHQGedjdHGSI="; }; - # Upstream has Cargo.lock gitignored - cargoPatches = [ ./update-Cargo-lock.diff ]; + passthru.updateScript = unstableGitUpdater { + url = "https://gitlab.com/snakedye/kile.git"; + }; - cargoSha256 = "sha256-TEgIiw/XTDUOe9K7agHWI86f88w+eDJ332V0CgNHtfo="; + cargoSha256 = "sha256-dzOkiZYHQu5AuwkbWEtIJAyZ1TNIGYkfz+S3q6K384w="; + + nativeBuildInputs = [ scdoc ]; + + postInstall = '' + mkdir -p $out/share/man + scdoc < doc/kile.1.scd > $out/share/man/kile.1 + ''; meta = with lib; { description = "A tiling layout generator for river"; diff --git a/pkgs/applications/misc/kile-wl/update-Cargo-lock.diff b/pkgs/applications/misc/kile-wl/update-Cargo-lock.diff deleted file mode 100644 index 8fc9fc555e83..000000000000 --- a/pkgs/applications/misc/kile-wl/update-Cargo-lock.diff +++ /dev/null @@ -1,153 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -new file mode 100644 -index 0000000..05cf87b ---- /dev/null -+++ b/Cargo.lock -@@ -0,0 +1,147 @@ -+# This file is automatically @generated by Cargo. -+# It is not intended for manual editing. -+[[package]] -+name = "bitflags" -+version = "1.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+ -+[[package]] -+name = "cc" -+version = "1.0.67" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" -+ -+[[package]] -+name = "cfg-if" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -+ -+[[package]] -+name = "downcast-rs" -+version = "1.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" -+ -+[[package]] -+name = "kile" -+version = "0.1.0" -+dependencies = [ -+ "wayland-client", -+ "wayland-commons", -+ "wayland-scanner", -+] -+ -+[[package]] -+name = "libc" -+version = "0.2.93" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41" -+ -+[[package]] -+name = "nix" -+version = "0.20.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" -+dependencies = [ -+ "bitflags", -+ "cc", -+ "cfg-if", -+ "libc", -+] -+ -+[[package]] -+name = "once_cell" -+version = "1.7.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" -+ -+[[package]] -+name = "pkg-config" -+version = "0.3.19" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" -+dependencies = [ -+ "unicode-xid", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -+dependencies = [ -+ "proc-macro2", -+] -+ -+[[package]] -+name = "smallvec" -+version = "1.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" -+ -+[[package]] -+name = "wayland-client" -+version = "0.28.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "06ca44d86554b85cf449f1557edc6cc7da935cc748c8e4bf1c507cbd43bae02c" -+dependencies = [ -+ "bitflags", -+ "downcast-rs", -+ "libc", -+ "nix", -+ "wayland-commons", -+ "wayland-scanner", -+ "wayland-sys", -+] -+ -+[[package]] -+name = "wayland-commons" -+version = "0.28.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8bd75ae380325dbcff2707f0cd9869827ea1d2d6d534cff076858d3f0460fd5a" -+dependencies = [ -+ "nix", -+ "once_cell", -+ "smallvec", -+ "wayland-sys", -+] -+ -+[[package]] -+name = "wayland-scanner" -+version = "0.28.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "389d680d7bd67512dc9c37f39560224327038deb0f0e8d33f870900441b68720" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "xml-rs", -+] -+ -+[[package]] -+name = "wayland-sys" -+version = "0.28.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2907bd297eef464a95ba9349ea771611771aa285b932526c633dc94d5400a8e2" -+dependencies = [ -+ "pkg-config", -+] -+ -+[[package]] -+name = "xml-rs" -+version = "0.8.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a"