From adeb63e4c26a7162d2bc3eab350fc922627243e1 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 5 Jan 2011 09:42:56 +0000
Subject: remove aterm242fixes

svn path=/nixpkgs/trunk/; revision=25407
---
 pkgs/build-support/vm/test.nix                   |  6 ++---
 pkgs/development/libraries/aterm/2.4.2-fixes.nix | 29 ------------------------
 pkgs/top-level/all-packages.nix                  |  4 ----
 pkgs/top-level/release.nix                       |  1 -
 4 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/development/libraries/aterm/2.4.2-fixes.nix

(limited to 'pkgs')

diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix
index be1ff5d1a92d9..c742a05aa1124 100644
--- a/pkgs/build-support/vm/test.nix
+++ b/pkgs/build-support/vm/test.nix
@@ -32,7 +32,7 @@ rec {
     '';
   });
 
-
+/*
   testFreeBSD = runInGenericVM {
     name = "aterm-freebsd";
     src = aterm242fixes.src;
@@ -65,6 +65,6 @@ rec {
       make install
     '';
   };
-  
+*/  
 
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/libraries/aterm/2.4.2-fixes.nix b/pkgs/development/libraries/aterm/2.4.2-fixes.nix
deleted file mode 100644
index b02da9be1ace2..0000000000000
--- a/pkgs/development/libraries/aterm/2.4.2-fixes.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "aterm-2.4.2-fixes-r2";
-  
-  src = fetchurl {
-    url = http://nixos.org/tarballs/aterm-2.4.2-fixes-r2.tar.bz2;
-    sha256 = "1w3bxdpc2hz29li5ssmdcz3x0fn47r7g62ns0v8nazxwf40vff4j";
-  };
-
-  patches = [
-    # Fix for http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=841
-    ./max-long.patch
-  ];
-
-  # There are apparently still some aliasing bugs left in
-  # aterm-2.4.2-fixes-r2 (in AT_setAnnotations to be precise), but
-  # under my reading of the C standard it should be fine. Anyway, just
-  # disable strict aliasing.
-  NIX_CFLAGS_COMPILE = "-fno-strict-aliasing";
-  
-  doCheck = true;
-
-  meta = {
-    homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm;
-    license = "LGPL";
-    description = "Library for manipulation of term data structures in C";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92443d10e4d8f..34bd056153eec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2737,10 +2737,6 @@ let
 
   aterm = aterm25;
 
-  aterm242fixes = lowPrio (import ../development/libraries/aterm/2.4.2-fixes.nix {
-    inherit fetchurl stdenv;
-  });
-
   aterm25 = callPackage ../development/libraries/aterm/2.5.nix { };
 
   aterm28 = lowPrio (callPackage ../development/libraries/aterm/2.8.nix { });
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 54bc621cf2f5a..9d88a74fdb7fc 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -21,7 +21,6 @@ with (import ./release-lib.nix);
   apacheHttpd = linux;
   aspell = all;
   at = linux;
-  aterm242fixes = all;
   aterm25 = all;
   aterm28 = all;
   audacious = linux;
-- 
cgit 1.4.1