Fix merge conflicts with main
This commit is contained in:
		
						commit
						7e121d224d
					
				
					 4 changed files with 17 additions and 18 deletions
				
			
		| 
						 | 
				
			
			@ -23,14 +23,14 @@
 | 
			
		|||
      devShells = forEachSupportedSystem ({ pkgs }: {
 | 
			
		||||
        default = pkgs.mkShell {
 | 
			
		||||
          packages = with pkgs; [
 | 
			
		||||
          rustToolchain
 | 
			
		||||
          openssl
 | 
			
		||||
          pkg-config
 | 
			
		||||
          cargo-deny
 | 
			
		||||
          cargo-edit
 | 
			
		||||
          cargo-watch
 | 
			
		||||
          rust-analyzer
 | 
			
		||||
        ];
 | 
			
		||||
            rustToolchain
 | 
			
		||||
            openssl
 | 
			
		||||
            pkg-config
 | 
			
		||||
            cargo-deny
 | 
			
		||||
            cargo-edit
 | 
			
		||||
            cargo-watch
 | 
			
		||||
            rust-analyzer
 | 
			
		||||
          ];
 | 
			
		||||
        };
 | 
			
		||||
      });
 | 
			
		||||
    };
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue