Lillian-Violet/dev-templates
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix merge conflicts with main

Browse source
This commit is contained in:
Luc Perkins 2023-07-13 17:18:17 -07:00
parent 8532ea5be8 1cc7b2178a
commit 7e121d224d
No known key found for this signature in database
GPG key ID: CED8419FB058467A
4 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
python/flake.nix
View file

@ -1,7 +1,6 @@
{ {
description = "A Nix-flake-based Python development environment"; description = "A Nix-flake-based Python development environment";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
outputs = { self, nixpkgs }: outputs = { self, nixpkgs }:

16
rust-toolchain/flake.nix
View file

@ -23,14 +23,14 @@
devShells = forEachSupportedSystem ({ pkgs }: { devShells = forEachSupportedSystem ({ pkgs }: {
default = pkgs.mkShell { default = pkgs.mkShell {
packages = with pkgs; [ packages = with pkgs; [
rustToolchain rustToolchain
openssl openssl
pkg-config pkg-config
cargo-deny cargo-deny
cargo-edit cargo-edit
cargo-watch cargo-watch
rust-analyzer rust-analyzer
]; ];
}; };
}); });
}; };

16
rust/flake.nix
View file

@ -32,14 +32,14 @@
devShells = forEachSupportedSystem ({ pkgs }: { devShells = forEachSupportedSystem ({ pkgs }: {
default = pkgs.mkShell { default = pkgs.mkShell {
packages = with pkgs; [ packages = with pkgs; [
rustToolchain rustToolchain
openssl openssl
pkg-config pkg-config
cargo-deny cargo-deny
cargo-edit cargo-edit
cargo-watch cargo-watch
rust-analyzer rust-analyzer
]; ];
}; };
}); });
}; };

2
scala/flake.nix
View file

@ -21,7 +21,7 @@
{ {
devShells = forEachSupportedSystem ({ pkgs }: { devShells = forEachSupportedSystem ({ pkgs }: {
default = pkgs.mkShell { default = pkgs.mkShell {
packages = with pkgs; [ scala sbt coursier ]; packages = with pkgs; [ scala sbt coursier ];
}; };
}); });
}; };