From f06523735a9b5632ac33be227f369db8e9329367 Mon Sep 17 00:00:00 2001 From: rina Date: Mon, 11 Sep 2023 10:42:16 +1000 Subject: [PATCH] remove nix files (now in separate repository). --- asli.nix | 37 ------------------------------------- aslp.nix | 32 -------------------------------- default.nix | 3 --- shell.nix | 20 -------------------- 4 files changed, 92 deletions(-) delete mode 100644 asli.nix delete mode 100644 aslp.nix delete mode 100644 default.nix delete mode 100644 shell.nix diff --git a/asli.nix b/asli.nix deleted file mode 100644 index 843109d6..00000000 --- a/asli.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, - fetchFromGitHub, - ocaml, - pkgs, - ocamlPackages -}: - - -ocamlPackages.buildDunePackage { - pname = "asli"; - version = "0.2.0"; - - minimalOCamlVersion = "4.09"; - - src = pkgs.nix-gitignore.gitignoreSource ["*.nix" "result" "result-*"] ./.; - - checkInputs = [ ocamlPackages.alcotest ]; - buildInputs = [ pkgs.z3 ]; - nativeBuildInputs = (with pkgs; [ ott gnused ]) ++ (with ocamlPackages; [ menhir ]); - propagatedBuildInputs = with ocamlPackages; [ linenoise pprint zarith z3 ocaml_pcre ]; - doCheck = lib.versionAtLeast ocaml.version "4.09"; - - configurePhase = '' - export ASLI_OTT=${pkgs.ott.out + "/share/ott"} - mkdir -p $out/asl - cp -rv prelude.asl mra_tools tests $out/asl - ''; - - outputs = [ "out" ]; - - meta = { - homepage = "https://github.com/inhabitedtype/angstrom"; - description = "OCaml parser combinators built for speed and memory efficiency"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ sternenseemann ]; - }; -} diff --git a/aslp.nix b/aslp.nix deleted file mode 100644 index b72f1110..00000000 --- a/aslp.nix +++ /dev/null @@ -1,32 +0,0 @@ - -{ stdenv, makeBinaryWrapper, asli }: - stdenv.mkDerivation { - name = "aslp"; - buildInputs = [ asli ]; - nativeBuildInputs = [ makeBinaryWrapper ]; - unpackPhase = "true"; - installPhase = '' - mkdir -p $out/bin - - ASL_PATH=${asli}/asl - cd ${asli}/bin - makeBinaryWrapper "$(pwd)/asli" $out/bin/aslp \ - --append-flags --prelude \ - --append-flags $ASL_PATH/prelude.asl \ - --append-flags $ASL_PATH/prelude.asl \ - --append-flags $ASL_PATH/mra_tools/arch/regs.asl \ - --append-flags $ASL_PATH/mra_tools/types.asl \ - --append-flags $ASL_PATH/mra_tools/arch/arch.asl \ - --append-flags $ASL_PATH/mra_tools/arch/arch_instrs.asl \ - --append-flags $ASL_PATH/mra_tools/arch/arch_decode.asl \ - --append-flags $ASL_PATH/mra_tools/support/aes.asl \ - --append-flags $ASL_PATH/mra_tools/support/barriers.asl \ - --append-flags $ASL_PATH/mra_tools/support/debug.asl \ - --append-flags $ASL_PATH/mra_tools/support/feature.asl \ - --append-flags $ASL_PATH/mra_tools/support/hints.asl \ - --append-flags $ASL_PATH/mra_tools/support/interrupts.asl \ - --append-flags $ASL_PATH/mra_tools/support/memory.asl \ - --append-flags $ASL_PATH/mra_tools/support/stubs.asl \ - --append-flags $ASL_PATH/tests/override.asl - ''; - } diff --git a/default.nix b/default.nix deleted file mode 100644 index 7c8b8c1e..00000000 --- a/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ pkgs ? import { system = builtins.currentSystem; } }: - pkgs.callPackage ./asli.nix {} - diff --git a/shell.nix b/shell.nix deleted file mode 100644 index efe4eade..00000000 --- a/shell.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs ? import {} }: -pkgs.mkShell { - packages = [ pkgs.ocaml pkgs.ott pkgs.ocamlPackages.merlin pkgs.ocamlPackages.ocaml-lsp pkgs.ocamlformat ]; - - inputsFrom = [ pkgs.asli ]; - - shellHook = '' - export DEBUG=1 - export OPAMSWITCH=nix-shell-asli - CAML_LD_PREV=$CAML_LD_LIBRARY_PATH - - #opam init --no-setup - #opam switch create $OPAMSWITCH ocaml-system - #eval $(opam env) - - export ASLI_OTT=${pkgs.ott}/share/ott - - #export CAML_LD_LIBRARY_PATH=$CAML_LD_PREV:$CAML_LD_LIBRARY_PATH - ''; -}