about summary refs log tree commit diff
path: root/nixpkgs/pkgs/shells/yash
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-09-01 11:51:02 +0000
committerAlyssa Ross <hi@alyssa.is>2023-09-01 11:51:02 +0000
commitaa4353b499e6950b7333578f936455a628145c31 (patch)
treec6332cedece2327a18d08794755b3fc0f9f1905b /nixpkgs/pkgs/shells/yash
parentac456d475f4e50818499b804359355c0f3b4bbf7 (diff)
parent52185f4d76c18d8348f963795dfed1de018e8dfe (diff)
downloadnixlib-aa4353b499e6950b7333578f936455a628145c31.tar
nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.gz
nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.bz2
nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.lz
nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.xz
nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.zst
nixlib-aa4353b499e6950b7333578f936455a628145c31.zip
Merge https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/shells/yash')
-rw-r--r--nixpkgs/pkgs/shells/yash/default.nix15
1 files changed, 9 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/shells/yash/default.nix b/nixpkgs/pkgs/shells/yash/default.nix
index 6af39debf565..4957c657b86d 100644
--- a/nixpkgs/pkgs/shells/yash/default.nix
+++ b/nixpkgs/pkgs/shells/yash/default.nix
@@ -1,16 +1,19 @@
-{ stdenv, lib, fetchurl, gettext, ncurses }:
+{ stdenv, lib, fetchFromGitHub, gettext, ncurses, asciidoc }:
 
 stdenv.mkDerivation rec {
   pname = "yash";
-  version = "2.54";
+  version = "2.55";
 
-  src = fetchurl {
-    url = "https://osdn.net/dl/yash/yash-${version}.tar.xz";
-    hash = "sha256-RKCsHM98Os7PvqAn2MDJMPE6goBlvjGAVc4RMBU5GDk=";
+  src = fetchFromGitHub {
+    owner = "magicant";
+    repo = pname;
+    rev = version;
+    hash = "sha256-raTIqklo69JEuhzdWUK3uywuLjqeQJCJ9nvnLRxlGr4=";
   };
 
   strictDeps = true;
-  buildInputs = [ gettext ncurses ];
+  nativeBuildInputs = [ asciidoc gettext ];
+  buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ gettext ];
 
   meta = with lib; {
     homepage = "https://yash.osdn.jp/index.html.en";