From 96c1ec6181b1abbcca7b50102d590bd73ed66404 Mon Sep 17 00:00:00 2001 From: zeme Date: Thu, 12 Dec 2024 17:11:42 +0100 Subject: [PATCH] remove scripts from shell --- nix/shell.nix | 56 +++++++++------------------------------------------ 1 file changed, 10 insertions(+), 46 deletions(-) diff --git a/nix/shell.nix b/nix/shell.nix index ac4931ec5af..313fabf07e9 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -9,18 +9,15 @@ let # Devshell doesn't run setup hooks from other packages, so just extract # the correct values of the environment variables from the haskell.nix # shell and use those. - certEnv = pkgs.runCommand "cert-env" - { - nativeBuildInputs = cabalProject.shell.nativeBuildInputs; - buildInputs = cabalProject.shell.buildInputs; - } - '' - echo "export COQPATH=$COQPATH" >> $out - echo "export OCAMLPATH=$OCAMLPATH" >> $out - echo "export CAML_LD_LIBRARY_PATH=$CAML_LD_LIBRARY_PATH" >> $out - echo "export OCAMLFIND_DESTDIR=$OCAMLFIND_DESTDIR" >> $out - ''; - + certEnv = pkgs.runCommand "cert-env" { + nativeBuildInputs = cabalProject.shell.nativeBuildInputs; + buildInputs = cabalProject.shell.buildInputs; + } '' + echo "export COQPATH=$COQPATH" >> $out + echo "export OCAMLPATH=$OCAMLPATH" >> $out + echo "export CAML_LD_LIBRARY_PATH=$CAML_LD_LIBRARY_PATH" >> $out + echo "export OCAMLFIND_DESTDIR=$OCAMLFIND_DESTDIR" >> $out + ''; linux-pkgs = lib.optionals pkgs.hostPlatform.isLinux [ # Needed to fix the frequency and governor of the CPU running the benchmarks @@ -30,7 +27,6 @@ let pkgs.papi ]; - all-pkgs = [ repoRoot.nix.agda.agda-with-stdlib @@ -75,45 +71,13 @@ let pkgs.nodejs_20 ]; -in - -{ +in { name = "plutus"; - welcomeMessage = "🤟 \\033[1;34mWelcome to Plutus\\033[0m 🤟"; - packages = lib.concatLists [ all-pkgs linux-pkgs ]; - - scripts.assemble-changelog = { - description = "Assembles the changelog for PACKAGE at VERSION"; - exec = repoRoot.scripts."assemble-changelog.sh"; - group = "changelog"; - }; - - - scripts.prepare-release = { - description = "Prepares to release PACKAGEs at VERSION"; - exec = repoRoot.scripts."prepare-release.sh"; - group = "changelog"; - }; - - - scripts.update-version = { - description = "Updates the version for PACKAGE to VERSION"; - exec = repoRoot.scripts."update-version.sh"; - group = "changelog"; - }; - - - shellHook = '' - ${builtins.readFile certEnv} - ${repoRoot.nix.agda.shell-hook-exports} - ''; - - preCommit = { stylish-haskell.enable = true; cabal-fmt.enable = true;