File tree Expand file tree Collapse file tree 5 files changed +8
-394
lines changed
development/compilers/zig Expand file tree Collapse file tree 5 files changed +8
-394
lines changed Original file line number Diff line number Diff line change 11{
22 lib ,
33 callPackage ,
4- llvmPackages_15 ,
54 llvmPackages_16 ,
65 llvmPackages_17 ,
76 llvmPackages_18 ,
87 zigVersions ? { } ,
98} :
109let
1110 versions = {
12- "0.10.1" = {
13- llvmPackages = llvmPackages_15 ;
14- hash = "sha256-69QIkkKzApOGfrBdgtmxFMDytRkSh+0YiaJQPbXsBeo=" ;
15- } ;
1611 "0.11.0" = {
1712 llvmPackages = llvmPackages_16 ;
1813 hash = "sha256-iuU1fzkbJxI+0N1PiLQM013Pd1bzrgqkbIyTxo5gB2I=" ;
Original file line number Diff line number Diff line change @@ -28,13 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
2828 inherit hash ;
2929 } ;
3030
31- patches =
32- args . patches or [ ]
33- ++
34- lib . optional ( lib . versions . majorMinor finalAttrs . version == "0.10" )
35- # Backport alignment related panics from zig-master to 0.10.
36- # Upstream issue: https://github.com/ziglang/zig/issues/14559
37- ./patches/0.10-macho-fixes.patch ;
31+ patches = args . patches or [ ] ;
3832
3933 nativeBuildInputs = [
4034 cmake
@@ -63,7 +57,8 @@ stdenv.mkDerivation (finalAttrs: {
6357
6458 outputs = [
6559 "out"
66- ] ++ lib . optional ( lib . versionAtLeast finalAttrs . version "0.10" ) "doc" ;
60+ "doc"
61+ ] ;
6762
6863 # strictDeps breaks zig when clang is being used.
6964 # https://github.com/NixOS/nixpkgs/issues/317055#issuecomment-2148438395
@@ -102,28 +97,20 @@ stdenv.mkDerivation (finalAttrs: {
10297 ''
10398 stage3/bin/zig build langref
10499 ''
105- else if lib . versionAtLeast finalAttrs . version "0.11" then
100+ else
106101 ''
107102 stage3/bin/zig run ../tools/docgen.zig -- ../doc/langref.html.in langref.html --zig $PWD/stage3/bin/zig
108- ''
109- else if lib . versionAtLeast finalAttrs . version "0.10" then
110- ''
111- ./zig2 run ../doc/docgen.zig -- ./zig2 ../doc/langref.html.in langref.html
112- ''
113- else
114- null ;
103+ '' ;
115104
116105 postInstall =
117106 if lib . versionAtLeast finalAttrs . version "0.13" then
118107 ''
119108 install -Dm444 ../zig-out/doc/langref.html -t $doc/share/doc/zig-${ finalAttrs . version } /html
120109 ''
121- else if lib . versionAtLeast finalAttrs . version "0.10" then
110+ else
122111 ''
123112 install -Dm444 langref.html -t $doc/share/doc/zig-${ finalAttrs . version } /html
124- ''
125- else
126- null ;
113+ '' ;
127114
128115 doInstallCheck = true ;
129116 installCheckPhase = ''
You can’t perform that action at this time.
0 commit comments