From cc9e0dbad8b751e3389fa3a454ddd3bc21f868dc Mon Sep 17 00:00:00 2001 From: Kovacsics Robert Date: Wed, 2 Dec 2020 11:29:11 +0000 Subject: [PATCH 1/2] icon-lang: 9.5.1 -> unstable-2020-02-05 Latest release (https://github.com/gtownsend/icon/releases/tag/ok2018j) doesn't seem like a properly versioned release. Latest properly versioned release (https://github.com/gtownsend/icon/releases/tag/rel951) is from 2013. So I have decided to use the unstable release, which works. --- .../interpreters/icon-lang/default.nix | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index 8190dc0f29f..cd8ad150264 100644 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ b/pkgs/development/interpreters/icon-lang/default.nix @@ -1,30 +1,34 @@ -{ stdenv, fetchFromGitHub -, libX11, libXt +{ stdenv +, fetchFromGitHub +, libX11 +, libXt , withGraphics ? true }: stdenv.mkDerivation rec { pname = "icon-lang"; - version = "9.5.20i"; - + version = "unstable-2020-02-05"; src = fetchFromGitHub { owner = "gtownsend"; repo = "icon"; - rev = "v${version}"; - sha256 = "0072b3jk8mc94w818z8bklhjdf9rf0d9a7lkvw40pz3niy7zv84s"; + rev = "829cff33de4a21546fb269de3ef5acd7b4f0c0c7"; + sha256 = "1lj2f13pbaajcy4v3744bz46rghhw5sv4dwwfnzhsllbj5gnjsv2"; }; buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ]; - configurePhase = let - target = if withGraphics then "X-Configure" else "Configure"; - platform = if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "macintosh" - else if stdenv.isBSD then "bsd" - else if stdenv.isCygwin then "cygwin" - else if stdenv.isSunOS then "solaris" - else throw "unsupported system"; - in "make ${target} name=${platform}"; + configurePhase = + let + target = if withGraphics then "X-Configure" else "Configure"; + platform = + if stdenv.isLinux then "linux" + else if stdenv.isDarwin then "macintosh" + else if stdenv.isBSD then "bsd" + else if stdenv.isCygwin then "cygwin" + else if stdenv.isSunOS then "solaris" + else throw "unsupported system"; + in + "make ${target} name=${platform}"; installPhase = "make Install dest=$out"; From 99addb8b342aa50d4d2c672c64ddff6d3b6ea06f Mon Sep 17 00:00:00 2001 From: Kovacsics Robert Date: Tue, 25 Feb 2020 17:40:13 +0000 Subject: [PATCH 2/2] icon-lang: refactor doc location --- pkgs/development/interpreters/icon-lang/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index cd8ad150264..02992e71871 100644 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ b/pkgs/development/interpreters/icon-lang/default.nix @@ -30,7 +30,12 @@ stdenv.mkDerivation rec { in "make ${target} name=${platform}"; - installPhase = "make Install dest=$out"; + installPhase = '' + make Install dest=$out + rm $out/README + mkdir -p $out/share/doc + mv $out/doc $out/share/doc/icon + ''; meta = with stdenv.lib; { description = ''A very high level general-purpose programming language'';