[commit: ghc] master: hadrian: Drop nix build script (c00d2f5)

git at git.haskell.org git at git.haskell.org
Sat Dec 8 19:12:03 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c00d2f59df1f3707d529531fd0c6b55903516ec4/ghc

>---------------------------------------------------------------

commit c00d2f59df1f3707d529531fd0c6b55903516ec4
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Dec 8 17:57:59 2018 +0000

    hadrian: Drop nix build script
    
    It's currently too out-of-date to build current hadrian and is arguably
    completely broken anyways (see #15794).


>---------------------------------------------------------------

c00d2f59df1f3707d529531fd0c6b55903516ec4
 .../{i386-linux => i386-linux-deb9}/Dockerfile     |  0
 hadrian/build.nix.sh                               | 35 ---------
 hadrian/shell.nix                                  | 89 ----------------------
 3 files changed, 124 deletions(-)

diff --git a/.circleci/images/i386-linux/Dockerfile b/.circleci/images/i386-linux-deb9/Dockerfile
similarity index 100%
copy from .circleci/images/i386-linux/Dockerfile
copy to .circleci/images/i386-linux-deb9/Dockerfile
diff --git a/hadrian/build.nix.sh b/hadrian/build.nix.sh
deleted file mode 100755
index 4b03ea8..0000000
--- a/hadrian/build.nix.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i bash shell.nix
-
-# This script sets up the build environment by invoking nix-shell shell.nix
-# and then runs the hadrian executable.
-
-function rl {
-    TARGET_FILE="$1"
-
-    cd "$(dirname "$TARGET_FILE")"
-    TARGET_FILE="$(basename "$TARGET_FILE")"
-
-    # Iterate down a (possible) chain of symlinks
-    while [ -L "$TARGET_FILE" ]
-    do
-        TARGET_FILE="$(readlink "$TARGET_FILE")"
-        cd "$(dirname "$TARGET_FILE")"
-        TARGET_FILE="$(basename "$TARGET_FILE")"
-    done
-
-    # Compute the canonicalized name by finding the physical path
-    # for the directory we're in and appending the target file.
-    PHYS_DIR="$(pwd -P)"
-    RESULT="$PHYS_DIR/$TARGET_FILE"
-    echo "$RESULT"
-}
-
-absoluteRoot="$(dirname "$(rl "$0")")"
-echo $absoluteRoot
-cd "$absoluteRoot"
-
-hadrian         \
-  --lint                         \
-  --directory="$absoluteRoot/.." \
-  "$@"
diff --git a/hadrian/shell.nix b/hadrian/shell.nix
deleted file mode 100644
index 041bf09..0000000
--- a/hadrian/shell.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-# Invoking nix-shell sets up an environment where we can build ghc
-# by only invoking hadrian.
-
-
-{ _nixpkgs ? import <nixpkgs> {} }:
-
-let
-
-  nixpkgs = import (_nixpkgs.fetchFromGitHub {
-    owner = "NixOS";
-    repo = "nixpkgs";
-    rev = "e7a327da5cffdf5e77e1924906a4f0983591bd3e";
-    sha256 = "1xzil4mayhggg2miwspbk12nihlszg0y4n6i4qacrxql5n75f0hr";
-  }){ overlays = [cabalHashes]; };
-
-
-
-  cabalHashes = sel: super: {
-    all-cabal-hashes = super.fetchurl {
-      url    = "https://github.com/commercialhaskell/all-cabal-hashes/archive/b2b93ae610f5f1b51d22b191f972dc3dec8f94c6.tar.gz";
-      sha256 = "0bffclpqbw62xff36qlzxghr042mhv0m06k5ml4298w6fv7ly1xw";
-    };
-  };
-
-  haskellPackages = nixpkgs.haskell.packages.ghc822;
-
-  removeBuild = path: type:
-    let baseName = baseNameOf (toString path);
-    in
-        ! (baseName == "_build"
-           || baseName == "dist"
-           || baseName == "dist-newstyle"
-           || baseName == ".stack-work"
-           || baseName == "config.log"
-           || baseName == "config.status"
-           || baseName == "shell.nix"
-           || nixpkgs.lib.hasSuffix ".sh" baseName
-           || !(nixpkgs.lib.cleanSourceFilter path type)) ;
-
-  filterSrc = path: builtins.filterSource removeBuild path;
-
-
-  hadrianPackages = nixpkgs.haskell.packages.ghc822.override {
-    overrides = self: super: let
-        localPackage = name: path: self.callCabal2nix name (filterSrc path) {};
-      in {
-        hadrian = localPackage "hadrian" ./. ;
-        happy = nixpkgs.haskell.lib.dontCheck (super.happy);
-        shake = self.callHackage "shake" "0.16.2" {};
-        extra = self.callHackage "extra" "1.6.4" {};
-        QuickCheck = self.callHackage "QuickCheck" "2.10" {};
-        Cabal = localPackage "Cabal" ./../libraries/Cabal/Cabal ;
-        filepath = localPackage "filepath" ./../libraries/filepath ;
-        text = localPackage "text" ./../libraries/text  ;
-        hpc = localPackage"hpc" ./../libraries/hpc ;
-        parsec = localPackage "parsec" ./../libraries/parsec ;
-        HUnit = nixpkgs.haskell.lib.dontCheck (self.callHackage "HUnit" "1.3.1.2" {});
-        process = localPackage "process" ./../libraries/process ;
-        directory = localPackage "directory" ./../libraries/directory ;
-      }; };
-
-  cabalPackages = nixpkgs.haskell.packages.ghc822.override {
-    overrides = self: super: let
-        localPackage = name: path: self.callCabal2nix name (filterSrc path) {};
-      in {
-        Cabal = localPackage "Cabal" ./../../cabal/Cabal ;
-        cabal-install = self.callPackage ./../../cabal/cabal-install.nix {};
-      }; };
-
-
-in
-  nixpkgs.lib.overrideDerivation nixpkgs.haskell.packages.ghcHEAD.ghc
-    (drv: {
-      name = "ghc-dev";
-      nativeBuildInputs = drv.nativeBuildInputs ++
-        [ hadrianPackages.hadrian
-          nixpkgs.arcanist
-          nixpkgs.git
-          nixpkgs.gmp.dev nixpkgs.gmp.out
-          nixpkgs.ncurses.dev nixpkgs.ncurses.out
-          nixpkgs.python3Packages.sphinx
-          nixpkgs.texlive.combined.scheme-basic
-          (nixpkgs.haskell.packages.ghc822.ghcWithPackages
-            (ps: [ps.html ps.regex-compat ps.dump-core]))
-
-          #cabalPackages.cabal-install
-        ];
-    })
-



More information about the ghc-commits mailing list