b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #32189 from yrashk/ats2-0.3.7

Browse source 
ats2: 0.3.0 -> 0.3.7
This commit is contained in:
Joachim F 2017-12-11 23:27:27 +00:00 committed by GitHub
parent 90accc093e a83067ea9e
commit 1354099daf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/compilers/ats2/default.nix
View file

@ -3,11 +3,11 @@
, withContrib ? true }:
let
versionPkg = "0.3.0" ;
versionPkg = "0.3.7" ;
contrib = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ;
sha256 = "1s4yscisn9gsr692jmh4y5mz03012pv84cm7l5n51v83wc08fks0" ;
sha256 = "1w59ir9ij5bvvnxj6fb1rvzycfqa57i31wmpwawxbsb10bqwzyr6";
};
postInstallContrib = stdenv.lib.optionalString withContrib
@ -31,11 +31,9 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
sha256 = "1knf03r8a5sis7n8rw54flf1lxfbr3prywxb1czcdp6hsbcd1v1d";
sha256 = "19nxyi39fn42sp38kl14a6pvbxq9wr8y405wx0zz7mqb77r0m0h5";
};
patches = [ ./install-postiats-contrib.patch ];
buildInputs = [ gmp ];
setupHook = with stdenv.lib;

19
pkgs/development/compilers/ats2/install-postiats-contrib.patch
View file

@ -1,19 +0,0 @@
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 && \