From 4bee4a2400a0df3d81e1d86de88b1f30b62a8efe Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 9 Sep 2019 21:41:32 +0200 Subject: [PATCH 1/2] liblouis: format with nixpkgs-fmt --- .../libraries/liblouis/default.nix | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index 6dfb95d1fb83..96977f345148 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -1,12 +1,18 @@ -{ fetchFromGitHub, stdenv, autoreconfHook, pkgconfig, gettext, python3 -, texinfo, help2man, libyaml, perl +{ fetchFromGitHub +, stdenv +, autoreconfHook +, pkgconfig +, gettext +, python3 +, texinfo +, help2man +, libyaml +, perl }: -let - version = "3.10.0"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "liblouis"; - inherit version; + version = "3.10.0"; src = fetchFromGitHub { owner = "liblouis"; @@ -18,9 +24,13 @@ in stdenv.mkDerivation { outputs = [ "out" "dev" "man" "info" "doc" ]; nativeBuildInputs = [ - autoreconfHook pkgconfig gettext python3 + autoreconfHook + pkgconfig + gettext + python3 # Docs, man, info - texinfo help2man + texinfo + help2man ]; buildInputs = [ From cf7995dbfa10ae04236278bc1423b905afccd041 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 9 Sep 2019 21:42:08 +0200 Subject: [PATCH 2/2] =?UTF-8?q?liblouis:=203.10.0=20=E2=86=92=203.11.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit http://liblouis.org/liblouis/2019/09/02/release-3.11.0.html --- pkgs/development/libraries/liblouis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index 96977f345148..0f73be7ebcea 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "1wimv2wfl566jp8hhrxr91dmx20hldqzj70dar8i9k3hzq1kmb4q"; + sha256 = "1y0pypgxchxczdnjkblibbvvy4gdk2pf8dzpqmbf824c7zpy8z5r"; }; outputs = [ "out" "dev" "man" "info" "doc" ];