diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 97e95b29814d..59ce006e8357 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.12" ; + versionPkg = "0.2.13" ; contrib = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ; - sha256 = "16jzabmwq5yz72dzlkc2hmvf2lan83gayn21gbl65jgpwdsbh170" ; + sha256 = "1hsqvdwiydks46sfjmm04rmjcx5v25xpjgnq0b96psrdbd0ky2kf" ; }; postInstallContrib = stdenv.lib.optionalString withContrib @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "0m8gmm1pnklixxw76yjjqqqixm2cyp91rnq4sj1k29qp4k9zxpl4"; + sha256 = "01rkybkwgbpx6blv72n46ml9ii3p6kpxbpczsrpbjkqmf22b4vii"; }; buildInputs = [ gmp ]; @@ -45,8 +45,6 @@ stdenv.mkDerivation rec { builtins.toFile "setupHook.sh" (concatMapStringsSep "\n" builtins.readFile hookFiles); - patches = [ ./installed-lib-directory-version.patch ]; - postInstall = postInstallContrib + postInstallEmacs; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/ats2/installed-lib-directory-version.patch b/pkgs/development/compilers/ats2/installed-lib-directory-version.patch deleted file mode 100644 index 686df69299f2..000000000000 --- a/pkgs/development/compilers/ats2/installed-lib-directory-version.patch +++ /dev/null @@ -1,99 +0,0 @@ -Change the name of the library directory to match the version of the package. - -diff -Naur ATS2-Postiats-0.2.12/configure postiats-new/configure ---- ATS2-Postiats-0.2.12/configure 2016-10-13 12:03:20.000000000 -0400 -+++ postiats-new/configure 2016-10-23 20:17:29.912579618 -0400 -@@ -1,6 +1,6 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.69 for ATS2/Postiats 0.2.10. -+# Generated by GNU Autoconf 2.69 for ATS2/Postiats 0.2.12. - # - # Report bugs to . - # -@@ -580,8 +580,8 @@ - # Identity of this package. - PACKAGE_NAME='ATS2/Postiats' - PACKAGE_TARNAME='ats2-postiats' --PACKAGE_VERSION='0.2.10' --PACKAGE_STRING='ATS2/Postiats 0.2.10' -+PACKAGE_VERSION='0.2.12' -+PACKAGE_STRING='ATS2/Postiats 0.2.12' - PACKAGE_BUGREPORT='gmpostiats@gmail.com' - PACKAGE_URL='' - -@@ -1242,7 +1242,7 @@ - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF --\`configure' configures ATS2/Postiats 0.2.10 to adapt to many kinds of systems. -+\`configure' configures ATS2/Postiats 0.2.12 to adapt to many kinds of systems. - - Usage: $0 [OPTION]... [VAR=VALUE]... - -@@ -1304,7 +1304,7 @@ - - if test -n "$ac_init_help"; then - case $ac_init_help in -- short | recursive ) echo "Configuration of ATS2/Postiats 0.2.10:";; -+ short | recursive ) echo "Configuration of ATS2/Postiats 0.2.12:";; - esac - cat <<\_ACEOF - -@@ -1384,7 +1384,7 @@ - test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF --ATS2/Postiats configure 0.2.10 -+ATS2/Postiats configure 0.2.12 - generated by GNU Autoconf 2.69 - - Copyright (C) 2012 Free Software Foundation, Inc. -@@ -1936,7 +1936,7 @@ - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - --It was created by ATS2/Postiats $as_me 0.2.10, which was -+It was created by ATS2/Postiats $as_me 0.2.12, which was - generated by GNU Autoconf 2.69. Invocation command line was - - $ $0 $@ -@@ -4226,7 +4226,7 @@ - # report actual input values of CONFIG_FILES etc. instead of their - # values after options handling. - ac_log=" --This file was extended by ATS2/Postiats $as_me 0.2.10, which was -+This file was extended by ATS2/Postiats $as_me 0.2.12, which was - generated by GNU Autoconf 2.69. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES -@@ -4288,7 +4288,7 @@ - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ --ATS2/Postiats config.status 0.2.10 -+ATS2/Postiats config.status 0.2.12 - configured by $0, generated by GNU Autoconf 2.69, - with options \\"\$ac_cs_config\\" - -diff -Naur ATS2-Postiats-0.2.12/src/CBOOT/config.h postiats-new/src/CBOOT/config.h ---- ATS2-Postiats-0.2.12/src/CBOOT/config.h 2016-10-13 12:03:20.000000000 -0400 -+++ postiats-new/src/CBOOT/config.h 2016-10-23 20:16:34.613836556 -0400 -@@ -44,7 +44,7 @@ - #define PACKAGE_NAME "ATS2/Postiats" - - /* Define to the full name and version of this package. */ --#define PACKAGE_STRING "ATS2/Postiats 0.2.10" -+#define PACKAGE_STRING "ATS2/Postiats 0.2.12" - - /* Define to the one symbol short name of this package. */ - #define PACKAGE_TARNAME "ats2-postiats" -@@ -53,7 +53,7 @@ - #define PACKAGE_URL "" - - /* Define to the version of this package. */ --#define PACKAGE_VERSION "0.2.10" -+#define PACKAGE_VERSION "0.2.12" - - /* The size of `void*', as computed by sizeof. */ - #define SIZEOF_VOIDP 8