Fix these two templates
This commit is contained in:
		
							parent
							
								
									0ea67a261e
								
							
						
					
					
						commit
						4e96eb7733
					
				
					 2 changed files with 64 additions and 57 deletions
				
			
		| 
						 | 
				
			
			@ -2,48 +2,50 @@
 | 
			
		|||
  description = "A Nix-flake-based Rust development environment";
 | 
			
		||||
 | 
			
		||||
  inputs = {
 | 
			
		||||
    inputs.nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.*.tar.gz";
 | 
			
		||||
    nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.*.tar.gz";
 | 
			
		||||
    rust-overlay = {
 | 
			
		||||
      url = "github:oxalica/rust-overlay";
 | 
			
		||||
      inputs.nixpkgs.follows = "nixpkgs";
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  outputs = { self, nixpkgs, rust-overlay }:
 | 
			
		||||
    let
 | 
			
		||||
      overlays = [
 | 
			
		||||
        rust-overlay.overlays.default
 | 
			
		||||
        (final: prev: {
 | 
			
		||||
          rustToolchain =
 | 
			
		||||
            let
 | 
			
		||||
              rust = prev.rust-bin;
 | 
			
		||||
            in
 | 
			
		||||
            if builtins.pathExists ./rust-toolchain.toml then
 | 
			
		||||
              rust.fromRustupToolchainFile ./rust-toolchain.toml
 | 
			
		||||
            else if builtins.pathExists ./rust-toolchain then
 | 
			
		||||
              rust.fromRustupToolchainFile ./rust-toolchain
 | 
			
		||||
            else
 | 
			
		||||
              rust.stable.latest.default;
 | 
			
		||||
        })
 | 
			
		||||
      ];
 | 
			
		||||
      supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
 | 
			
		||||
      forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
 | 
			
		||||
        pkgs = import nixpkgs { inherit overlays system; };
 | 
			
		||||
      });
 | 
			
		||||
    in
 | 
			
		||||
    {
 | 
			
		||||
      devShells = forEachSupportedSystem ({ pkgs }: {
 | 
			
		||||
        default = pkgs.mkShell {
 | 
			
		||||
          packages = with pkgs; [
 | 
			
		||||
            rustToolchain
 | 
			
		||||
            openssl
 | 
			
		||||
            pkg-config
 | 
			
		||||
            cargo-deny
 | 
			
		||||
            cargo-edit
 | 
			
		||||
            cargo-watch
 | 
			
		||||
            rust-analyzer
 | 
			
		||||
          ];
 | 
			
		||||
        };
 | 
			
		||||
      });
 | 
			
		||||
    };
 | 
			
		||||
  outputs = {
 | 
			
		||||
    self,
 | 
			
		||||
    nixpkgs,
 | 
			
		||||
    rust-overlay,
 | 
			
		||||
  }: let
 | 
			
		||||
    overlays = [
 | 
			
		||||
      rust-overlay.overlays.default
 | 
			
		||||
      (final: prev: {
 | 
			
		||||
        rustToolchain = let
 | 
			
		||||
          rust = prev.rust-bin;
 | 
			
		||||
        in
 | 
			
		||||
          if builtins.pathExists ./rust-toolchain.toml
 | 
			
		||||
          then rust.fromRustupToolchainFile ./rust-toolchain.toml
 | 
			
		||||
          else if builtins.pathExists ./rust-toolchain
 | 
			
		||||
          then rust.fromRustupToolchainFile ./rust-toolchain
 | 
			
		||||
          else rust.stable.latest.default;
 | 
			
		||||
      })
 | 
			
		||||
    ];
 | 
			
		||||
    supportedSystems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
 | 
			
		||||
    forEachSupportedSystem = f:
 | 
			
		||||
      nixpkgs.lib.genAttrs supportedSystems (system:
 | 
			
		||||
        f {
 | 
			
		||||
          pkgs = import nixpkgs {inherit overlays system;};
 | 
			
		||||
        });
 | 
			
		||||
  in {
 | 
			
		||||
    devShells = forEachSupportedSystem ({pkgs}: {
 | 
			
		||||
      default = pkgs.mkShell {
 | 
			
		||||
        packages = with pkgs; [
 | 
			
		||||
          rustToolchain
 | 
			
		||||
          openssl
 | 
			
		||||
          pkg-config
 | 
			
		||||
          cargo-deny
 | 
			
		||||
          cargo-edit
 | 
			
		||||
          cargo-watch
 | 
			
		||||
          rust-analyzer
 | 
			
		||||
        ];
 | 
			
		||||
      };
 | 
			
		||||
    });
 | 
			
		||||
  };
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue