nix flake update, add overlay and nixosModule
	
		
			
	
		
	
	
		
	
		
			All checks were successful
		
		
	
	
		
			
				
	
				Rust / build (push) Successful in 9m41s
				
			
		
		
	
	
				
					
				
			
		
			All checks were successful
		
		
	
	Rust / build (push) Successful in 9m41s
				
			This commit is contained in:
		
							parent
							
								
									2a4818dc21
								
							
						
					
					
						commit
						07a5fbca27
					
				
					 2 changed files with 59 additions and 9 deletions
				
			
		
							
								
								
									
										52
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										52
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							|  | @ -1,17 +1,40 @@ | ||||||
| { | { | ||||||
|   "nodes": { |   "nodes": { | ||||||
|  |     "fenix": { | ||||||
|  |       "inputs": { | ||||||
|  |         "nixpkgs": [ | ||||||
|  |           "naersk", | ||||||
|  |           "nixpkgs" | ||||||
|  |         ], | ||||||
|  |         "rust-analyzer-src": "rust-analyzer-src" | ||||||
|  |       }, | ||||||
|  |       "locked": { | ||||||
|  |         "lastModified": 1752475459, | ||||||
|  |         "narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=", | ||||||
|  |         "owner": "nix-community", | ||||||
|  |         "repo": "fenix", | ||||||
|  |         "rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f", | ||||||
|  |         "type": "github" | ||||||
|  |       }, | ||||||
|  |       "original": { | ||||||
|  |         "owner": "nix-community", | ||||||
|  |         "repo": "fenix", | ||||||
|  |         "type": "github" | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|     "naersk": { |     "naersk": { | ||||||
|       "inputs": { |       "inputs": { | ||||||
|  |         "fenix": "fenix", | ||||||
|         "nixpkgs": [ |         "nixpkgs": [ | ||||||
|           "nixpkgs" |           "nixpkgs" | ||||||
|         ] |         ] | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1745925850, |         "lastModified": 1752689277, | ||||||
|         "narHash": "sha256-cyAAMal0aPrlb1NgzMxZqeN1mAJ2pJseDhm2m6Um8T0=", |         "narHash": "sha256-uldUBFkZe/E7qbvxa3mH1ItrWZyT6w1dBKJQF/3ZSsc=", | ||||||
|         "owner": "nix-community", |         "owner": "nix-community", | ||||||
|         "repo": "naersk", |         "repo": "naersk", | ||||||
|         "rev": "38bc60bbc157ae266d4a0c96671c6c742ee17a5f", |         "rev": "0e72363d0938b0208d6c646d10649164c43f4d64", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|  | @ -37,11 +60,11 @@ | ||||||
|     }, |     }, | ||||||
|     "nixpkgs": { |     "nixpkgs": { | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1750969886, |         "lastModified": 1757545623, | ||||||
|         "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=", |         "narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=", | ||||||
|         "owner": "nixos", |         "owner": "nixos", | ||||||
|         "repo": "nixpkgs", |         "repo": "nixpkgs", | ||||||
|         "rev": "a676066377a2fe7457369dd37c31fd2263b662f4", |         "rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|  | @ -57,6 +80,23 @@ | ||||||
|         "nix-filter": "nix-filter", |         "nix-filter": "nix-filter", | ||||||
|         "nixpkgs": "nixpkgs" |         "nixpkgs": "nixpkgs" | ||||||
|       } |       } | ||||||
|  |     }, | ||||||
|  |     "rust-analyzer-src": { | ||||||
|  |       "flake": false, | ||||||
|  |       "locked": { | ||||||
|  |         "lastModified": 1752428706, | ||||||
|  |         "narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=", | ||||||
|  |         "owner": "rust-lang", | ||||||
|  |         "repo": "rust-analyzer", | ||||||
|  |         "rev": "591e3b7624be97e4443ea7b5542c191311aa141d", | ||||||
|  |         "type": "github" | ||||||
|  |       }, | ||||||
|  |       "original": { | ||||||
|  |         "owner": "rust-lang", | ||||||
|  |         "ref": "nightly", | ||||||
|  |         "repo": "rust-analyzer", | ||||||
|  |         "type": "github" | ||||||
|  |       } | ||||||
|     } |     } | ||||||
|   }, |   }, | ||||||
|   "root": "root", |   "root": "root", | ||||||
|  |  | ||||||
							
								
								
									
										16
									
								
								flake.nix
									
										
									
									
									
								
							
							
						
						
									
										16
									
								
								flake.nix
									
										
									
									
									
								
							|  | @ -11,7 +11,7 @@ | ||||||
|   }; |   }; | ||||||
| 
 | 
 | ||||||
|   outputs = |   outputs = | ||||||
|     inputs@{ |     { | ||||||
|       self, |       self, | ||||||
|       nixpkgs, |       nixpkgs, | ||||||
|       naersk, |       naersk, | ||||||
|  | @ -42,7 +42,7 @@ | ||||||
|           naersk' = pkgs.callPackage naersk { }; |           naersk' = pkgs.callPackage naersk { }; | ||||||
|         in |         in | ||||||
|         rec { |         rec { | ||||||
|           servicepoint-cli = naersk'.buildPackage rec { |           servicepoint-cli = naersk'.buildPackage { | ||||||
|             src = nix-filter.lib.filter { |             src = nix-filter.lib.filter { | ||||||
|               root = ./.; |               root = ./.; | ||||||
|               include = [ |               include = [ | ||||||
|  | @ -80,6 +80,14 @@ | ||||||
| 
 | 
 | ||||||
|       legacyPackages = packages; |       legacyPackages = packages; | ||||||
| 
 | 
 | ||||||
|  |       nixosModules.default = { | ||||||
|  |         nixpkgs.overlays = [ self.overlays.default ]; | ||||||
|  |       }; | ||||||
|  | 
 | ||||||
|  |       overlays.default = final: prev: { | ||||||
|  |         servicepoint-cli = self.legacyPackages."${prev.system}".servicepoint-cli; | ||||||
|  |       }; | ||||||
|  | 
 | ||||||
|       devShells = forAllSystems ( |       devShells = forAllSystems ( | ||||||
|         { |         { | ||||||
|           pkgs, |           pkgs, | ||||||
|  | @ -106,10 +114,12 @@ | ||||||
|             ]; |             ]; | ||||||
|             LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath (builtins.concatMap (d: d.buildInputs) inputsFrom)}"; |             LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath (builtins.concatMap (d: d.buildInputs) inputsFrom)}"; | ||||||
|             RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}"; |             RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}"; | ||||||
|  |             RUST_LOG = "all"; | ||||||
|  |             RUST_BACKTRACE = "1"; | ||||||
|           }; |           }; | ||||||
|         } |         } | ||||||
|       ); |       ); | ||||||
| 
 | 
 | ||||||
|       formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-rfc-style); |       formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree); | ||||||
|     }; |     }; | ||||||
| } | } | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Vinzenz Schroeter
						Vinzenz Schroeter