Page MenuHomePhabricator
Files F2850074

D5167.id16779.diff
No OneTemporary
Actions

D5167.id16779.diff
View Options

diff --git a/flake.nix b/flake.nix
--- a/flake.nix
+++ b/flake.nix
@@ -27,20 +27,21 @@
# 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) devShell;
+ inherit (legacyPackages) devShells;
}) // {
# these outputs will lack the system suffix (e.g.
# devShell.aarch64-darwin), thus should be system agnostic such as
# overlays or utility functions.
- overlays = { inherit localOverlay; };
- overlay = localOverlay;
+ overlays.default = localOverlay;
+ };
- # Flake specific additions to what is found in /etc/nix/nix.conf
- # Add comm binary cache to avoid our pinned packages from needing
- # to be built by any consumer
- nixConfig = ''
- extra-substituters = https://comm.cachix.org
- extra-trusted-public-keys = comm.cachix.org-1:70RF31rkmCEhQ9HrXA2uXcpqQKGcUK3TxLJdgcUCaA4=
- '';
+ # Flake specific additions to what is found in /etc/nix/nix.conf
+ # Add comm binary cache to avoid our pinned packages from needing
+ # to be built by any consumer
+ nixConfig = {
+ extra-substituters = [ "https://comm.cachix.org" ];
+ extra-trusted-public-keys = [
+ "comm.cachix.org-1:70RF31rkmCEhQ9HrXA2uXcpqQKGcUK3TxLJdgcUCaA4="
+ ];
};
}
diff --git a/nix/overlay.nix b/nix/overlay.nix
--- a/nix/overlay.nix
+++ b/nix/overlay.nix
@@ -51,7 +51,7 @@
protobuf_3_15_cmake = prev.callPackage ./protobuf_3_15.nix { };
- devShell = final.callPackage ./dev-shell.nix { };
+ devShells.default = final.callPackage ./dev-shell.nix { };
# Make our version of mariadb the default everywhere
mariadb = prev.mariadb_108;

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 1, 11:13 AM (21 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2210691
Default Alt Text
D5167.id16779.diff (1 KB)

Event Timeline