diff --git a/Makefile b/Makefile index d93cf9a..c6e4e22 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ default: test test: - nix-shell -A shell --pure --run './test.bash' + nix-shell --pure --run './test.bash' diff --git a/README.md b/README.md index 247d42a..7b5d1cd 100644 --- a/README.md +++ b/README.md @@ -9,22 +9,22 @@ Derivations for easily downloading Dhall binaries and putting them to use. You cn get an appropriate nix-shell with the binaries installed by first testing this with: ``` -nix-shell -A shell +nix-shell ``` ## Installation You might choose to simply copy the derivations from this repository, or you can fetch the git/Github repo using the various helpers: -```nix +``` > nix repl nix-repl> pkgs = import {} nix-repl> drvs = import (pkgs.fetchFromGitHub { owner = "justinwoo"; repo = "easy-dhall-nix"; - rev = "87406a76409c16bbd7511e397cfc52e1c58954e3"; - sha256 = "1sjpckyhvlks5yls0qqfd0iaf7pxp1sp3dikqh41lg6xsxx6lqhi"; + rev = # some REV + sha256 = # some SHA }) {} nix-repl> drvs.dhall-simple diff --git a/default.nix b/default.nix index e0c5c79..23c0f0f 100644 --- a/default.nix +++ b/default.nix @@ -1,21 +1,8 @@ { pkgs ? import {} }: -let +{ dhall-simple = import ./dhall-simple.nix {}; dhall-json-simple = import ./dhall-json-simple.nix {}; dhall-bash-simple = import ./dhall-bash-simple.nix {}; dhall-text-simple = import ./dhall-text-simple.nix {}; -in { - inherit dhall-simple; - - shell = pkgs.stdenv.mkDerivation { - name = "easy-dhall-nix-shell"; - - buildInputs = [ - dhall-simple - dhall-json-simple - dhall-bash-simple - dhall-text-simple - ]; - }; } diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..1435bfe --- /dev/null +++ b/shell.nix @@ -0,0 +1,6 @@ +{ pkgs ? import {} }: + +pkgs.stdenv.mkDerivation { + name = "easy-dhall-nix-shell"; + buildInputs = builtins.attrValues (import ./default.nix { inherit pkgs; }); +}