s/buildInputs/packages

This commit is contained in:
Luc Perkins 2023-02-14 16:20:41 -08:00
parent 2dbb282412
commit 8ff6066f01
No known key found for this signature in database
GPG key ID: 4F102D0C16E232F2
28 changed files with 37 additions and 33 deletions

View file

@ -33,7 +33,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ boot clojure leiningen ]; packages = with pkgs; [ boot clojure leiningen ];
shellHook = '' shellHook = ''
${pkgs.clojure}/bin/clj --version ${pkgs.clojure}/bin/clj --version

View file

@ -18,7 +18,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ cue ]; packages = with pkgs; [ cue ];
shellHook = '' shellHook = ''
${pkgs.cue}/bin/cue version ${pkgs.cue}/bin/cue version

View file

@ -34,7 +34,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = (with pkgs; [ dhall ]) ++ dhallTools; packages = (with pkgs; [ dhall ]) ++ dhallTools;
shellHook = '' shellHook = ''
echo "dhall `${pkgs.dhall}/bin/dhall --version`" echo "dhall `${pkgs.dhall}/bin/dhall --version`"

View file

@ -18,7 +18,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = (with pkgs; [ elixir ]) ++ packages = (with pkgs; [ elixir ]) ++
pkgs.lib.optionals (pkgs.stdenv.isLinux) (with pkgs; [ gigalixir inotify-tools libnotify ]) ++ # Linux only pkgs.lib.optionals (pkgs.stdenv.isLinux) (with pkgs; [ gigalixir inotify-tools libnotify ]) ++ # Linux only
pkgs.lib.optionals (pkgs.stdenv.isDarwin) (with pkgs; [ terminal-notifier ]) ++ # macOS only pkgs.lib.optionals (pkgs.stdenv.isDarwin) (with pkgs; [ terminal-notifier ]) ++ # macOS only
(with pkgs.darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices ]); (with pkgs.darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices ]);

View file

@ -18,7 +18,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = (with pkgs.elmPackages; [ elm ]) ++ (with pkgs; [ elm2nix ]); packages = (with pkgs.elmPackages; [ elm ]) ++ (with pkgs; [ elm2nix ]);
shellHook = with pkgs.elmPackages; '' shellHook = with pkgs.elmPackages; ''
echo "elm `${elm}/bin/elm --version`" echo "elm `${elm}/bin/elm --version`"

View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1667077288, "lastModified": 1676283394,
"narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -17,11 +17,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1667055375, "lastModified": 1676209454,
"narHash": "sha256-xfSTHYxuKRiqF4dcuAFdti1OUvrC2lHpQqCHWUK5/JA=", "narHash": "sha256-alj9mBkV9U6tTPDK026671D2pesLSYZZc9j5dBZJ9f0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7f9be6a505a31f88499c5d20d11f98accf5ae6ba", "rev": "8c619a1f3cedd16ea172146e30645e703d21bfc1",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -174,7 +174,11 @@
''; '';
in in
{ {
devShells = { default = mkShell { buildInputs = [ format update ]; }; }; devShells = {
default = mkShell {
packages = [ format update ];
};
};
packages = rec { packages = rec {
default = dvt; default = dvt;

View file

@ -18,7 +18,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ gleam ]; packages = with pkgs; [ gleam ];
shellHook = '' shellHook = ''
${pkgs.gleam}/bin/gleam --version ${pkgs.gleam}/bin/gleam --version

View file

@ -20,7 +20,7 @@
in in
{ {
devShells.default = pkgs.mkShellNoCC { devShells.default = pkgs.mkShellNoCC {
buildInputs = with pkgs; [ packages = with pkgs; [
# go 1.19 (specified by overlay) # go 1.19 (specified by overlay)
go go

View file

@ -19,7 +19,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ packages = with pkgs; [
packer packer
terraform terraform
tflint tflint

View file

@ -18,7 +18,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ cabal-install ghc ]; packages = with pkgs; [ cabal-install ghc ];
shellHook = with pkgs; '' shellHook = with pkgs; ''
${ghc}/bin/ghc --version ${ghc}/bin/ghc --version

View file

@ -32,7 +32,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ gradle jdk maven ]; packages = with pkgs; [ gradle jdk maven ];
shellHook = '' shellHook = ''
${pkgs.jdk}/bin/java -version ${pkgs.jdk}/bin/java -version

View file

@ -32,7 +32,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ kotlin gradle gcc ncurses patchelf zlib ]; packages = with pkgs; [ kotlin gradle gcc ncurses patchelf zlib ];
shellHook = '' shellHook = ''
${pkgs.kotlin}/bin/kotlin -version ${pkgs.kotlin}/bin/kotlin -version

View file

@ -18,7 +18,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ nickel ]; packages = with pkgs; [ nickel ];
shellHook = '' shellHook = ''
${pkgs.nickel}/bin/nickel --version ${pkgs.nickel}/bin/nickel --version

View file

@ -18,7 +18,7 @@
in in
{ {
devShell = pkgs.mkShell { devShell = pkgs.mkShell {
buildInputs = with pkgs; [ nim ]; packages = with pkgs; [ nim ];
shellHook = '' shellHook = ''
${pkgs.nim}/bin/nim --version ${pkgs.nim}/bin/nim --version

View file

@ -18,7 +18,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ packages = with pkgs; [
cachix cachix
lorri lorri
niv niv

View file

@ -25,7 +25,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ node2nix nodejs pnpm yarn ]; packages = with pkgs; [ node2nix nodejs pnpm yarn ];
shellHook = '' shellHook = ''
echo "node `${pkgs.nodejs}/bin/node --version`" echo "node `${pkgs.nodejs}/bin/node --version`"

View file

@ -18,7 +18,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ ocaml ocamlformat ] ++ packages = with pkgs; [ ocaml ocamlformat ] ++
(with pkgs.ocamlPackages; [ dune_3 odoc ]); (with pkgs.ocamlPackages; [ dune_3 odoc ]);
shellHook = '' shellHook = ''

View file

@ -18,7 +18,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ open-policy-agent conftest ]; packages = with pkgs; [ open-policy-agent conftest ];
shellHook = '' shellHook = ''
${pkgs.open-policy-agent}/bin/opa version ${pkgs.open-policy-agent}/bin/opa version

View file

@ -18,7 +18,7 @@
in in
{ {
devShell = pkgs.mkShell { devShell = pkgs.mkShell {
buildInputs = with pkgs; [ phpPackages.composer php ]; packages = with pkgs; [ phpPackages.composer php ];
shellHook = '' shellHook = ''
echo "`${pkgs.php}/bin/php --version`" echo "`${pkgs.php}/bin/php --version`"

View file

@ -17,7 +17,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ buf protobuf ]; packages = with pkgs; [ buf protobuf ];
shellHook = with pkgs; '' shellHook = with pkgs; ''
echo "buf `${buf}/bin/buf --version`" echo "buf `${buf}/bin/buf --version`"

View file

@ -22,7 +22,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = [ packages = [
easy-ps.purs easy-ps.purs
easy-ps.spago easy-ps.spago
easy-ps.purescript-language-server easy-ps.purescript-language-server

View file

@ -26,7 +26,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ python machNix virtualenv ] ++ packages = with pkgs; [ python machNix virtualenv ] ++
(with pkgs.python311Packages; [ pip ]); (with pkgs.python311Packages; [ pip ]);
shellHook = '' shellHook = ''

View file

@ -22,7 +22,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ ruby ]; packages = with pkgs; [ ruby ];
shellHook = '' shellHook = ''
${pkgs.ruby}/bin/ruby --version ${pkgs.ruby}/bin/ruby --version

View file

@ -27,7 +27,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
nativeBuildInputs = with pkgs; [ packages = with pkgs; [
rustToolchain rustToolchain
openssl openssl
pkg-config pkg-config

View file

@ -36,7 +36,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
nativeBuildInputs = with pkgs; [ packages = with pkgs; [
rustToolchain rustToolchain
openssl openssl
pkg-config pkg-config

View file

@ -32,7 +32,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ scala sbt coursier ]; packages = with pkgs; [ scala sbt coursier ];
shellHook = '' shellHook = ''
${pkgs.scala}/bin/scala -version ${pkgs.scala}/bin/scala -version

View file

@ -18,7 +18,7 @@
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ zig ]; packages = with pkgs; [ zig ];
shellHook = '' shellHook = ''
echo "zig `${pkgs.zig}/bin/zig version`" echo "zig `${pkgs.zig}/bin/zig version`"