D5196.diff
No OneTemporary
Actions

Size

905 B

Referenced Files

None

Subscribers

None

D5196.diff
View Options

	diff --git a/flake.nix b/flake.nix
	--- a/flake.nix
	+++ b/flake.nix
	@@ -27,7 +27,7 @@
	# https://github.com/numtide/flake-utils#usage for more examples
	in utils.lib.eachSystem [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ] (system: rec {
	legacyPackages = pkgsForSystem system;
	- inherit (legacyPackages) devShells;
	+ inherit (legacyPackages) devShell devShells;
	}) // {
	# these outputs will lack the system suffix (e.g.
	# devShell.aarch64-darwin), thus should be system agnostic such as
	diff --git a/nix/overlay.nix b/nix/overlay.nix
	--- a/nix/overlay.nix
	+++ b/nix/overlay.nix
	@@ -52,6 +52,7 @@
	protobuf_3_15_cmake = prev.callPackage ./protobuf_3_15.nix { };

	devShells.default = final.callPackage ./dev-shell.nix { };
	+ devShell = final.devShells.default;

	# Make our version of mariadb the default everywhere
	mariadb = prev.mariadb_108;