|
6 | 6 | flake-utils.url = "github:numtide/flake-utils"; |
7 | 7 | }; |
8 | 8 |
|
9 | | - outputs = { self, nixpkgs, flake-utils } @inputs: |
10 | | - flake-utils.lib.eachDefaultSystem (system: |
| 9 | + outputs = |
| 10 | + { |
| 11 | + self, |
| 12 | + nixpkgs, |
| 13 | + flake-utils, |
| 14 | + }@inputs: |
| 15 | + flake-utils.lib.eachDefaultSystem ( |
| 16 | + system: |
11 | 17 | let |
12 | 18 | pkgs = import nixpkgs { |
13 | 19 | inherit system; |
|
16 | 22 | bazel = bazel_7; |
17 | 23 | jdk = jdk; |
18 | 24 | }; |
19 | | - in { |
| 25 | + in |
| 26 | + { |
20 | 27 | devShells.default = |
21 | 28 | let |
22 | 29 | # There is too much volatility between even micro-versions of |
|
25 | 32 |
|
26 | 33 | # clang tidy: use latest. |
27 | 34 | clang_for_tidy = pkgs.llvmPackages_18.clang-tools; |
28 | | - in with pkgs; pkgs.mkShell{ |
| 35 | + in |
| 36 | + with pkgs; |
| 37 | + pkgs.mkShell { |
29 | 38 | packages = with pkgs; [ |
30 | 39 | git |
31 | 40 | common.bazel |
|
51 | 60 | openfpgaloader |
52 | 61 | ]; |
53 | 62 |
|
54 | | - CLANG_TIDY="${clang_for_tidy}/bin/clang-tidy"; |
55 | | - CLANG_FORMAT="${clang_for_formatting}/bin/clang-format"; |
| 63 | + CLANG_TIDY = "${clang_for_tidy}/bin/clang-tidy"; |
| 64 | + CLANG_FORMAT = "${clang_for_formatting}/bin/clang-format"; |
56 | 65 |
|
57 | 66 | shellHook = '' |
58 | 67 | exec bash |
59 | 68 | ''; |
60 | 69 | }; |
61 | 70 |
|
62 | 71 | # Package fpga-assembler. |
63 | | - packages.default = (pkgs.callPackage ( |
64 | | - { |
65 | | - buildBazelPackage, |
66 | | - stdenv, |
67 | | - fetchFromGitHub, |
68 | | - lib, |
69 | | - nix-gitignore, |
70 | | - }: |
71 | | - let |
72 | | - system = stdenv.hostPlatform.system; |
73 | | - registry = fetchFromGitHub { |
74 | | - owner = "bazelbuild"; |
75 | | - repo = "bazel-central-registry"; |
76 | | - rev = "63f3af762b2fdd7acaa7987856cd3ac314eaea09"; |
77 | | - hash = "sha256-ugNzoP0gdrhl9vH1TRdwoevuTsSqjitXnAoMSSTlCgI="; |
78 | | - }; |
79 | | - in |
| 72 | + packages.default = |
| 73 | + (pkgs.callPackage ( |
| 74 | + { |
| 75 | + buildBazelPackage, |
| 76 | + stdenv, |
| 77 | + fetchFromGitHub, |
| 78 | + lib, |
| 79 | + nix-gitignore, |
| 80 | + }: |
| 81 | + let |
| 82 | + system = stdenv.hostPlatform.system; |
| 83 | + registry = fetchFromGitHub { |
| 84 | + owner = "bazelbuild"; |
| 85 | + repo = "bazel-central-registry"; |
| 86 | + rev = "63f3af762b2fdd7acaa7987856cd3ac314eaea09"; |
| 87 | + hash = "sha256-ugNzoP0gdrhl9vH1TRdwoevuTsSqjitXnAoMSSTlCgI="; |
| 88 | + }; |
| 89 | + in |
80 | 90 | buildBazelPackage { |
81 | 91 | pname = "fpga-as"; |
82 | 92 |
|
83 | 93 | version = "0.0.1"; |
84 | 94 |
|
85 | | - src = nix-gitignore.gitignoreSourcePure [] ./.; |
| 95 | + src = nix-gitignore.gitignoreSourcePure [ ] ./.; |
86 | 96 |
|
87 | 97 | bazelFlags = [ |
88 | 98 | "--registry" |
|
99 | 109 | aarch64-linux = "sha256-E4VHjDa0qkHmKUNpTBfJi7dhMLcd1z5he+p31/XvUl8="; |
100 | 110 | x86_64-linux = "sha256-hVBJB0Hsd9sXuEoNcjhTkbPl89vlZT1w39JppCD+n8Y="; |
101 | 111 | } |
102 | | - .${system} or (throw "No hash for system: ${system}"); |
| 112 | + .${system} or (throw "No hash for system: ${system}"); |
103 | 113 | }; |
104 | 114 |
|
105 | 115 | removeRulesCC = false; |
|
133 | 143 | platforms = lib.platforms.linux; |
134 | 144 | }; |
135 | 145 | } |
136 | | - ) {}).overrideAttrs (final: prev: { |
137 | | - # Fixup the deps so they always contain correrct |
138 | | - # shebangs paths pointing to the store. |
139 | | - deps = prev.deps.overrideAttrs (final: prev: { |
140 | | - installPhase = '' |
141 | | - patchShebangs $bazelOut/external |
142 | | - '' + prev.installPhase; |
143 | | - }); |
144 | | - }); |
| 146 | + ) { }).overrideAttrs |
| 147 | + ( |
| 148 | + final: prev: { |
| 149 | + # Fixup the deps so they always contain correrct |
| 150 | + # shebangs paths pointing to the store. |
| 151 | + deps = prev.deps.overrideAttrs ( |
| 152 | + final: prev: { |
| 153 | + installPhase = |
| 154 | + '' |
| 155 | + patchShebangs $bazelOut/external |
| 156 | + '' |
| 157 | + + prev.installPhase; |
| 158 | + } |
| 159 | + ); |
| 160 | + } |
| 161 | + ); |
145 | 162 | } |
146 | 163 | ); |
147 | 164 | } |
0 commit comments