From 458ea7e649b0cf0f330780069f26f2848778f0d3 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Fri, 5 Nov 2021 14:10:43 -0600 Subject: [PATCH 1/2] wiki-tui: 0.3.4 -> 0.4.1 --- pkgs/misc/wiki-tui/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index b07dd8c731b1..d27d8360c58c 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -1,19 +1,25 @@ -{ lib, rustPlatform, fetchCrate, ncurses, openssl, pkg-config }: +{ lib, rustPlatform, fetchFromGitHub, ncurses, openssl, pkg-config, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "wiki-tui"; - version = "0.3.4"; + version = "0.4.1"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-H+C1AbZ2zUhw6TNlSPaNaNuY5iNf39JW4q2g6uolevM="; + src = fetchFromGitHub { + owner = "Builditluc"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-aCfYb5UvlWbBvBlwNjVIbOJlEV2b3+FD0qKO+9h5Nos="; }; buildInputs = [ ncurses openssl ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-PIt592nGtNEREQMukqRl/6KSJ/P32fWucHEMyOOc7BA="; + cargoSha256 = "sha256-dD8iC/b6KwElmq0RNdnHHC/jMWh7Q0/kMM+/zityHqQ="; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; meta = with lib; { description = "A simple and easy to use Wikipedia Text User Interface"; From 8c220df7947221bfc3d729f9816f5f3ba4ce5297 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Fri, 5 Nov 2021 14:30:48 -0600 Subject: [PATCH 2/2] wiki-tui: fix build on darwin --- pkgs/misc/wiki-tui/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index d27d8360c58c..168aff9a6cb6 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, ncurses, openssl, pkg-config, nix-update-script }: +{ lib, rustPlatform, fetchFromGitHub, ncurses, openssl, pkg-config, stdenv, nix-update-script, Security }: rustPlatform.buildRustPackage rec { pname = "wiki-tui"; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-aCfYb5UvlWbBvBlwNjVIbOJlEV2b3+FD0qKO+9h5Nos="; }; - buildInputs = [ ncurses openssl ]; + buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be7d1036a408..9976e8a7daac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32438,7 +32438,9 @@ with pkgs; wiki-js = callPackage ../servers/web-apps/wiki-js { }; - wiki-tui = callPackage ../misc/wiki-tui { }; + wiki-tui = callPackage ../misc/wiki-tui { + inherit (darwin.apple_sdk.frameworks) Security; + }; winePackagesFor = wineBuild: lib.makeExtensible (self: with self; { callPackage = newScope self;