From 9943b8da039d8933c86465bbcca9f6bc128c5c10 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 5 Dec 2011 02:53:26 +0000 Subject: [PATCH] Remove llvmSVN, it's outdated and doesn't work svn path=/nixpkgs/trunk/; revision=30732 --- pkgs/development/compilers/llvm/svn-head.nix | 66 -------------------- pkgs/top-level/all-packages.nix | 3 - 2 files changed, 69 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/svn-head.nix diff --git a/pkgs/development/compilers/llvm/svn-head.nix b/pkgs/development/compilers/llvm/svn-head.nix deleted file mode 100644 index f929815f8a21..000000000000 --- a/pkgs/development/compilers/llvm/svn-head.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv, fetchurl, gcc, flex, perl, libtool, groff, fetchsvn -, buildClang ? false }: - -let rev = "134309"; in -stdenv.mkDerivation ({ - name = "llvm-r${rev}"; - - src = fetchsvn { - url = "http://llvm.org/svn/llvm-project/llvm/trunk"; - inherit rev; - sha256 = "136qwpcl22r5bl9y4kk94vgbha1m58xrggy7qw19lg7jkgxxj8s6"; - }; - - buildInputs = [ gcc flex perl groff ]; - - configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ]; - - meta = { - homepage = http://llvm.org/; - description = "Collection of modular and reusable compiler and toolchain technologies"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; - }; -} -// stdenv.lib.optionalAttrs buildClang ( - # I write the assert because 'gcc.libc' will be evaluated although 'triplet' would not - # evaluate properly (in the preConfigure below) - assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - let - triplet = if (stdenv.system == "i686-linux") then "i686-unknown-linux-gnu" - else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu" - else throw "System not supported"; - in rec { - name = "clang-r${rev}"; - - srcClang = fetchsvn { - url = http://llvm.org/svn/llvm-project/cfe/trunk; - inherit rev; - sha256 = "0afbrjakfw6zgsplxblgzr2kwjndlnr2lnqjnbj16ggam5fcnhlr"; - }; - - prePatch = '' - cp -r ${srcClang} tools/clang - chmod u+rwX -R tools/clang - ''; - - patches = [ ./clang-include-paths-svn.patch ]; - - # Set up the header file paths - preConfigure = '' - sed -i -e 's,C_INCLUDE_PATH,"${gcc.libc}/include/",' \ - -e 's,CPP_HOST,"${triplet}",' \ - -e 's,CPP_INCLUDE_PATH,"${gcc.gcc}/include/c++/${gcc.gcc.version}",' \ - tools/clang/lib/Frontend/InitHeaderSearch.cpp - ''; - - meta = { - homepage = http://clang.llvm.org/; - description = "A C language family frontend for LLVM"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; - } -)) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5952d95d01d..3ed579e43340 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2311,9 +2311,6 @@ let llvm = callPackage ../development/compilers/llvm { }; - # Works partially - llvmSVN = callPackage ../development/compilers/llvm/svn-head.nix { }; - mitscheme = callPackage ../development/compilers/mit-scheme { }; mlton = callPackage ../development/compilers/mlton { };