From 8ff6066f014824f09aba171e104480cd65fcb4d7 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Tue, 14 Feb 2023 16:20:41 -0800 Subject: [PATCH] s/buildInputs/packages --- clojure/flake.nix | 2 +- cue/flake.nix | 2 +- dhall/flake.nix | 2 +- elixir/flake.nix | 2 +- elm/flake.nix | 2 +- flake.lock | 12 ++++++------ flake.nix | 6 +++++- gleam/flake.nix | 2 +- go/flake.nix | 2 +- hashi/flake.nix | 2 +- haskell/flake.nix | 2 +- java/flake.nix | 2 +- kotlin/flake.nix | 2 +- nickel/flake.nix | 2 +- nim/flake.nix | 2 +- nix/flake.nix | 2 +- node/flake.nix | 2 +- ocaml/flake.nix | 2 +- opa/flake.nix | 2 +- php/flake.nix | 2 +- protobuf/flake.nix | 2 +- purescript/flake.nix | 2 +- python/flake.nix | 2 +- ruby/flake.nix | 2 +- rust-toolchain/flake.nix | 2 +- rust/flake.nix | 2 +- scala/flake.nix | 2 +- zig/flake.nix | 2 +- 28 files changed, 37 insertions(+), 33 deletions(-) diff --git a/clojure/flake.nix b/clojure/flake.nix index f984a9e..56e34fb 100644 --- a/clojure/flake.nix +++ b/clojure/flake.nix @@ -33,7 +33,7 @@ in { devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ boot clojure leiningen ]; + packages = with pkgs; [ boot clojure leiningen ]; shellHook = '' ${pkgs.clojure}/bin/clj --version diff --git a/cue/flake.nix b/cue/flake.nix index 726ba64..9737cd6 100644 --- a/cue/flake.nix +++ b/cue/flake.nix @@ -18,7 +18,7 @@ in { devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ cue ]; + packages = with pkgs; [ cue ]; shellHook = '' ${pkgs.cue}/bin/cue version diff --git a/dhall/flake.nix b/dhall/flake.nix index e955504..3c066ae 100644 --- a/dhall/flake.nix +++ b/dhall/flake.nix @@ -34,7 +34,7 @@ in { devShells.default = pkgs.mkShell { - buildInputs = (with pkgs; [ dhall ]) ++ dhallTools; + packages = (with pkgs; [ dhall ]) ++ dhallTools; shellHook = '' echo "dhall `${pkgs.dhall}/bin/dhall --version`" diff --git a/elixir/flake.nix b/elixir/flake.nix index 49f3df7..02cfcf7 100644 --- a/elixir/flake.nix +++ b/elixir/flake.nix @@ -18,7 +18,7 @@ in { 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.isDarwin) (with pkgs; [ terminal-notifier ]) ++ # macOS only (with pkgs.darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices ]); diff --git a/elm/flake.nix b/elm/flake.nix index 5e8b56a..3f01d23 100644 --- a/elm/flake.nix +++ b/elm/flake.nix @@ -18,7 +18,7 @@ in { devShells.default = pkgs.mkShell { - buildInputs = (with pkgs.elmPackages; [ elm ]) ++ (with pkgs; [ elm2nix ]); + packages = (with pkgs.elmPackages; [ elm ]) ++ (with pkgs; [ elm2nix ]); shellHook = with pkgs.elmPackages; '' echo "elm `${elm}/bin/elm --version`" diff --git a/flake.lock b/flake.lock index 18b5e42..de60b4a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1667077288, - "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1667055375, - "narHash": "sha256-xfSTHYxuKRiqF4dcuAFdti1OUvrC2lHpQqCHWUK5/JA=", + "lastModified": 1676209454, + "narHash": "sha256-alj9mBkV9U6tTPDK026671D2pesLSYZZc9j5dBZJ9f0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7f9be6a505a31f88499c5d20d11f98accf5ae6ba", + "rev": "8c619a1f3cedd16ea172146e30645e703d21bfc1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7a21f24..51cd3b9 100644 --- a/flake.nix +++ b/flake.nix @@ -174,7 +174,11 @@ ''; in { - devShells = { default = mkShell { buildInputs = [ format update ]; }; }; + devShells = { + default = mkShell { + packages = [ format update ]; + }; + }; packages = rec { default = dvt; diff --git a/gleam/flake.nix b/gleam/flake.nix index 0f1f659..ba762ce 100644 --- a/gleam/flake.nix +++ b/gleam/flake.nix @@ -18,7 +18,7 @@ in { devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ gleam ]; + packages = with pkgs; [ gleam ]; shellHook = '' ${pkgs.gleam}/bin/gleam --version diff --git a/go/flake.nix b/go/flake.nix index ab4d6c2..d73b81b 100644 --- a/go/flake.nix +++ b/go/flake.nix @@ -20,7 +20,7 @@ in { devShells.default = pkgs.mkShellNoCC { - buildInputs = with pkgs; [ + packages = with pkgs; [ # go 1.19 (specified by overlay) go diff --git a/hashi/flake.nix b/hashi/flake.nix index 5040526..7cf1b95 100644 --- a/hashi/flake.nix +++ b/hashi/flake.nix @@ -19,7 +19,7 @@ in { devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ + packages = with pkgs; [ packer terraform tflint diff --git a/haskell/flake.nix b/haskell/flake.nix index 63ce1d2..1bdabac 100644 --- a/haskell/flake.nix +++ b/haskell/flake.nix @@ -18,7 +18,7 @@ in { devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ cabal-install ghc ]; + packages = with pkgs; [ cabal-install ghc ]; shellHook = with pkgs; '' ${ghc}/bin/ghc --version diff --git a/java/flake.nix b/java/flake.nix index 1ad6a15..498ea44 100644 --- a/java/flake.nix +++ b/java/flake.nix @@ -32,7 +32,7 @@ in { devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ gradle jdk maven ]; + packages = with pkgs; [ gradle jdk maven ]; shellHook = '' ${pkgs.jdk}/bin/java -version diff --git a/kotlin/flake.nix b/kotlin/flake.nix index 7daba80..8fb391b 100644 --- a/kotlin/flake.nix +++ b/kotlin/flake.nix @@ -32,7 +32,7 @@ in { devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ kotlin gradle gcc ncurses patchelf zlib ]; + packages = with pkgs; [ kotlin gradle gcc ncurses patchelf zlib ]; shellHook = '' ${pkgs.kotlin}/bin/kotlin -version diff --git a/nickel/flake.nix b/nickel/flake.nix index 422f2a8..806f0b8 100644 --- a/nickel/flake.nix +++ b/nickel/flake.nix @@ -18,7 +18,7 @@ in { devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ nickel ]; + packages = with pkgs; [ nickel ]; shellHook = '' ${pkgs.nickel}/bin/nickel --version diff --git a/nim/flake.nix b/nim/flake.nix index a67f6f0..eeae7e6 100644 --- a/nim/flake.nix +++ b/nim/flake.nix @@ -18,7 +18,7 @@ in { devShell = pkgs.mkShell { - buildInputs = with pkgs; [ nim ]; + packages = with pkgs; [ nim ]; shellHook = '' ${pkgs.nim}/bin/nim --version diff --git a/nix/flake.nix b/nix/flake.nix index afda172..b3ea51e 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -18,7 +18,7 @@ in { devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ + packages = with pkgs; [ cachix lorri niv diff --git a/node/flake.nix b/node/flake.nix index 8c92567..28c0561 100644 --- a/node/flake.nix +++ b/node/flake.nix @@ -25,7 +25,7 @@ in { devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ node2nix nodejs pnpm yarn ]; + packages = with pkgs; [ node2nix nodejs pnpm yarn ]; shellHook = '' echo "node `${pkgs.nodejs}/bin/node --version`" diff --git a/ocaml/flake.nix b/ocaml/flake.nix index f9cacb0..0f94633 100644 --- a/ocaml/flake.nix +++ b/ocaml/flake.nix @@ -18,7 +18,7 @@ in { devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ ocaml ocamlformat ] ++ + packages = with pkgs; [ ocaml ocamlformat ] ++ (with pkgs.ocamlPackages; [ dune_3 odoc ]); shellHook = '' diff --git a/opa/flake.nix b/opa/flake.nix index ca4af7b..75fd2cc 100644 --- a/opa/flake.nix +++ b/opa/flake.nix @@ -18,7 +18,7 @@ in { devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ open-policy-agent conftest ]; + packages = with pkgs; [ open-policy-agent conftest ]; shellHook = '' ${pkgs.open-policy-agent}/bin/opa version diff --git a/php/flake.nix b/php/flake.nix index df156e7..77b976a 100644 --- a/php/flake.nix +++ b/php/flake.nix @@ -18,7 +18,7 @@ in { devShell = pkgs.mkShell { - buildInputs = with pkgs; [ phpPackages.composer php ]; + packages = with pkgs; [ phpPackages.composer php ]; shellHook = '' echo "`${pkgs.php}/bin/php --version`" diff --git a/protobuf/flake.nix b/protobuf/flake.nix index 24cf3b4..ce5a132 100644 --- a/protobuf/flake.nix +++ b/protobuf/flake.nix @@ -17,7 +17,7 @@ in { devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ buf protobuf ]; + packages = with pkgs; [ buf protobuf ]; shellHook = with pkgs; '' echo "buf `${buf}/bin/buf --version`" diff --git a/purescript/flake.nix b/purescript/flake.nix index 20403fc..064e8e5 100644 --- a/purescript/flake.nix +++ b/purescript/flake.nix @@ -22,7 +22,7 @@ in { devShells.default = pkgs.mkShell { - buildInputs = [ + packages = [ easy-ps.purs easy-ps.spago easy-ps.purescript-language-server diff --git a/python/flake.nix b/python/flake.nix index 4027d74..8905993 100644 --- a/python/flake.nix +++ b/python/flake.nix @@ -26,7 +26,7 @@ in { devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ python machNix virtualenv ] ++ + packages = with pkgs; [ python machNix virtualenv ] ++ (with pkgs.python311Packages; [ pip ]); shellHook = '' diff --git a/ruby/flake.nix b/ruby/flake.nix index 5eb2131..dacc0d0 100644 --- a/ruby/flake.nix +++ b/ruby/flake.nix @@ -22,7 +22,7 @@ in { devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ ruby ]; + packages = with pkgs; [ ruby ]; shellHook = '' ${pkgs.ruby}/bin/ruby --version diff --git a/rust-toolchain/flake.nix b/rust-toolchain/flake.nix index b73d573..6843616 100644 --- a/rust-toolchain/flake.nix +++ b/rust-toolchain/flake.nix @@ -27,7 +27,7 @@ in { devShells.default = pkgs.mkShell { - nativeBuildInputs = with pkgs; [ + packages = with pkgs; [ rustToolchain openssl pkg-config diff --git a/rust/flake.nix b/rust/flake.nix index 93ddf84..a821f2b 100644 --- a/rust/flake.nix +++ b/rust/flake.nix @@ -36,7 +36,7 @@ in { devShells.default = pkgs.mkShell { - nativeBuildInputs = with pkgs; [ + packages = with pkgs; [ rustToolchain openssl pkg-config diff --git a/scala/flake.nix b/scala/flake.nix index 913ac41..6f9c974 100644 --- a/scala/flake.nix +++ b/scala/flake.nix @@ -32,7 +32,7 @@ in { devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ scala sbt coursier ]; + packages = with pkgs; [ scala sbt coursier ]; shellHook = '' ${pkgs.scala}/bin/scala -version diff --git a/zig/flake.nix b/zig/flake.nix index 99af3fa..771ac33 100644 --- a/zig/flake.nix +++ b/zig/flake.nix @@ -18,7 +18,7 @@ in { devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ zig ]; + packages = with pkgs; [ zig ]; shellHook = '' echo "zig `${pkgs.zig}/bin/zig version`"