diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2017-12-11 23:27:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-11 23:27:27 +0000 |
| commit | 1354099daf98b7a1f79e6c41ce6bfda5c40177ae (patch) | |
| tree | d604c853c345b75c39f5eb4c8b0a9b90798c33bb /pkgs | |
| parent | 90accc093e154d01881d642b3a94fe1b16a2bc00 (diff) | |
| parent | a83067ea9e858b8881e1d8cab6c5362518498c46 (diff) | |
| download | nixlib-1354099daf98b7a1f79e6c41ce6bfda5c40177ae.tar nixlib-1354099daf98b7a1f79e6c41ce6bfda5c40177ae.tar.gz nixlib-1354099daf98b7a1f79e6c41ce6bfda5c40177ae.tar.bz2 nixlib-1354099daf98b7a1f79e6c41ce6bfda5c40177ae.tar.lz nixlib-1354099daf98b7a1f79e6c41ce6bfda5c40177ae.tar.xz nixlib-1354099daf98b7a1f79e6c41ce6bfda5c40177ae.tar.zst nixlib-1354099daf98b7a1f79e6c41ce6bfda5c40177ae.zip | |
Merge pull request #32189 from yrashk/ats2-0.3.7
ats2: 0.3.0 -> 0.3.7
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/ats2/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/compilers/ats2/install-postiats-contrib.patch | 19 |
2 files changed, 3 insertions, 24 deletions
diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 3abd5c8c82a9..6c523ebb4f14 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -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; diff --git a/pkgs/development/compilers/ats2/install-postiats-contrib.patch b/pkgs/development/compilers/ats2/install-postiats-contrib.patch deleted file mode 100644 index cb280d028b52..000000000000 --- a/pkgs/development/compilers/ats2/install-postiats-contrib.patch +++ /dev/null @@ -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 && \ |