Compare commits
	
		
			12 Commits
		
	
	
		
			d1e43dba34
			...
			bed3d8ce31
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| bed3d8ce31 | |||
| 94068997d9 | |||
| ffcb91bd8d | |||
| ce3ae340fc | |||
| 163a409c80 | |||
| 22921b9823 | |||
| 7431fd6057 | |||
| b63528025d | |||
| ae5345ea62 | |||
| 29b3129517 | |||
| 1138e46b73 | |||
| cf7948e3c9 | 
							
								
								
									
										18
									
								
								flake.nix
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								flake.nix
									
									
									
									
									
								
							| @ -2,23 +2,17 @@ | |||||||
|   inputs.nixpkgs.url = "nixpkgs"; |   inputs.nixpkgs.url = "nixpkgs"; | ||||||
| 
 | 
 | ||||||
|   outputs = { self, nixpkgs, ...}: |   outputs = { self, nixpkgs, ...}: | ||||||
|     let |   let | ||||||
|  |     pkgs = import nixpkgs { | ||||||
|       # For now we only support x86 |       # For now we only support x86 | ||||||
|       system = "x86_64-linux"; |       system = "x86_64-linux"; | ||||||
|       pkgs = import nixpkgs { |       overlays = [ self.overlays.default ]; | ||||||
|         inherit system; |     }; | ||||||
|         overlays = [ self.overlays.default ]; |   in | ||||||
|       }; |  | ||||||
|     in |  | ||||||
|     { |     { | ||||||
|       bscOverlay = import ./overlay.nix; |       bscOverlay = import ./overlay.nix; | ||||||
|       overlays.default = self.bscOverlay; |       overlays.default = self.bscOverlay; | ||||||
|       # full nixpkgs with our overlay applied |       legacyPackages.x86_64-linux = pkgs; | ||||||
|       legacyPackages.${system} = pkgs; |  | ||||||
| 
 |  | ||||||
|       hydraJobs = { |  | ||||||
|         inherit (self.legacyPackages.${system}.bsc-ci) test pkgs; |  | ||||||
|       }; |  | ||||||
| 
 | 
 | ||||||
|       # propagate nixpkgs lib, so we can do bscpkgs.lib |       # propagate nixpkgs lib, so we can do bscpkgs.lib | ||||||
|       inherit (nixpkgs) lib; |       inherit (nixpkgs) lib; | ||||||
|  | |||||||
| @ -88,9 +88,7 @@ in bscPkgs // { | |||||||
|       }; |       }; | ||||||
|     }; |     }; | ||||||
| 
 | 
 | ||||||
|     pkgs = filterAttrs (_: isDerivation) bscPkgs; |     pkgs = final.runCommand "ci-pkgs" { } | ||||||
| 
 |  | ||||||
|     pkgsList = final.runCommand "ci-pkgs" { } |  | ||||||
|       "printf '%s\n' ${toString (collect isDerivation bscPkgs)} > $out"; |       "printf '%s\n' ${toString (collect isDerivation bscPkgs)} > $out"; | ||||||
| 
 | 
 | ||||||
|     tests = final.runCommand "ci-tests" { } |     tests = final.runCommand "ci-tests" { } | ||||||
| @ -98,7 +96,7 @@ in bscPkgs // { | |||||||
| 
 | 
 | ||||||
|     all = final.runCommand "ci-all" { } |     all = final.runCommand "ci-all" { } | ||||||
|     '' |     '' | ||||||
|       deps="${toString [ final.bsc-ci.pkgsList final.bsc-ci.tests ]}" |       deps="${toString [ final.bsc-ci.pkgs final.bsc-ci.tests ]}" | ||||||
|       cat $deps |       cat $deps | ||||||
|       printf '%s\n' $deps > $out |       printf '%s\n' $deps > $out | ||||||
|     ''; |     ''; | ||||||
|  | |||||||
| @ -43,22 +43,20 @@ let | |||||||
| 
 | 
 | ||||||
|   source = if (useGit) then git else release; |   source = if (useGit) then git else release; | ||||||
| 
 | 
 | ||||||
| in stdenv.mkDerivation { | in stdenv.mkDerivation rec { | ||||||
|   pname = "clang-ompss2"; |   pname = "clang-ompss2"; | ||||||
|   inherit (source) src version; |   inherit (source) src version; | ||||||
| 
 | 
 | ||||||
|   enableParallelBuilding = true; |   enableParallelBuilding = true; | ||||||
|  |   isClang = true; | ||||||
| 
 | 
 | ||||||
|   passthru = { |   passthru = { | ||||||
|     CC = "clang"; |     CC = "clang"; | ||||||
|     CXX = "clang++"; |     CXX = "clang++"; | ||||||
| 
 |  | ||||||
|     isClang = true; |  | ||||||
|     isClangWithOmpss = true; |  | ||||||
| 
 |  | ||||||
|     inherit gcc zlib; |  | ||||||
|   }; |   }; | ||||||
| 
 | 
 | ||||||
|  |   isClangWithOmpss = true; | ||||||
|  | 
 | ||||||
|   nativeBuildInputs = [ |   nativeBuildInputs = [ | ||||||
|     bash |     bash | ||||||
|     cmake |     cmake | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user