about summary refs log tree commit diff
path: root/pkgs/development/compilers/ats2
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/compilers/ats2')
-rw-r--r--pkgs/development/compilers/ats2/default.nix8
-rw-r--r--pkgs/development/compilers/ats2/install-postiats-contrib.patch19
2 files changed, 24 insertions, 3 deletions
diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index 59ce006e8357a..3abd5c8c82a94 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -3,11 +3,11 @@
 , withContrib ? true }:
 
 let
-  versionPkg = "0.2.13" ;
+  versionPkg = "0.3.0" ;
 
   contrib = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ;
-    sha256 = "1hsqvdwiydks46sfjmm04rmjcx5v25xpjgnq0b96psrdbd0ky2kf" ;
+    sha256 = "1s4yscisn9gsr692jmh4y5mz03012pv84cm7l5n51v83wc08fks0" ;
   };
 
   postInstallContrib = stdenv.lib.optionalString withContrib
@@ -31,9 +31,11 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
-    sha256 = "01rkybkwgbpx6blv72n46ml9ii3p6kpxbpczsrpbjkqmf22b4vii";
+    sha256 = "1knf03r8a5sis7n8rw54flf1lxfbr3prywxb1czcdp6hsbcd1v1d";
   };
 
+  patches = [ ./install-postiats-contrib.patch ];
+
   buildInputs = [ gmp ];
 
   setupHook = with stdenv.lib;
diff --git a/pkgs/development/compilers/ats2/install-postiats-contrib.patch b/pkgs/development/compilers/ats2/install-postiats-contrib.patch
new file mode 100644
index 0000000000000..cb280d028b521
--- /dev/null
+++ b/pkgs/development/compilers/ats2/install-postiats-contrib.patch
@@ -0,0 +1,19 @@
+Install the parts of the contrib that have been moved to Postiats.
+diff -Naur ATS2-Postiats-0.3.0-upstream/Makefile_dist ATS2-Postiats-0.3.0/Makefile_dist
+--- ATS2-Postiats-0.3.0-upstream/Makefile_dist	2017-01-20 10:23:54.000000000 -0400
++++ ATS2-Postiats-0.3.0/Makefile_dist	2017-01-21 13:14:27.614723335 -0400
+@@ -124,12 +124,12 @@
+   cd "$(abs_top_srcdir)" && \
+   $(MKDIR_P) $(PATSLIBHOME2)/bin && \
+   if [ ! -d $(bindir2) ] ; then $(MKDIR_P) $(bindir2) ; fi && \
+-  for x in share ccomp prelude libc libats ; do \
++  for x in share ccomp prelude libc libats contrib atscntrb ; do \
+     find "$$x" -type d -exec $(MKDIR_P) $(PATSLIBHOME2)/\{} \; -print; \
+   done
+ 
+ install_files_0: install_dirs ; \
+-  for x in share ccomp/runtime prelude libc libats ; do \
++  for x in share ccomp/runtime prelude libc libats contrib atscntrb ; do \
+     cd "$(abs_top_srcdir)" && \
+     $(INSTALL) -d $(PATSLIBHOME2)/"$$x" && \
+     find "$$x" -type l -exec cp -d \{} $(PATSLIBHOME2)/\{} \; -print && \