···55 /* Do not use "dev" as a version. If you do, Tilt will consider itself
66 running in development environment and try to serve assets from the
77 source tree, which is not there once build completes. */
88- version = "0.30.13";
88+ version = "0.31.2";
991010 src = fetchFromGitHub {
1111 owner = "tilt-dev";
1212 repo = pname;
1313 rev = "v${version}";
1414- sha256 = "sha256-W67aQIXp2TOtZuccjQUGC9gNtvdyUNWuU7VM2LOFkCg=";
1414+ sha256 = "sha256-Wn7e2g1KPnFgFuRPUh3g0FW/m0qRHV5reO+AZbhbaC8=";
1515 };
1616 vendorSha256 = null;
1717
+77-79
pkgs/development/compilers/gcc/10/default.nix
···2424, threadsCross ? null # for MinGW
2525, crossStageStatic ? false
2626, gnused ? null
2727-, cloog # unused; just for compat with gcc4, as we override the parameter on some places
2727+, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places
2828, buildPackages
2929, libxcrypt
3030}:
···8383 stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
8484 crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
85858686+ callFile = lib.callPackageWith {
8787+ # lets
8888+ inherit
8989+ majorVersion
9090+ version
9191+ buildPlatform
9292+ hostPlatform
9393+ targetPlatform
9494+ patches
9595+ crossMingw
9696+ stageNameAddon
9797+ crossNameAddon
9898+ ;
9999+ # inherit generated with 'nix eval --json --impure --expr "with import ./. {}; lib.attrNames (lib.functionArgs gcc10.cc.override)" | jq '.[]' --raw-output'
100100+ inherit
101101+ binutils
102102+ buildPackages
103103+ cloog
104104+ crossStageStatic
105105+ enableLTO
106106+ enableMultilib
107107+ enablePlugin
108108+ enableShared
109109+ fetchpatch
110110+ fetchurl
111111+ gettext
112112+ gmp
113113+ gnatboot
114114+ gnused
115115+ isl
116116+ langAda
117117+ langC
118118+ langCC
119119+ langD
120120+ langFortran
121121+ langGo
122122+ langJit
123123+ langObjC
124124+ langObjCpp
125125+ lib
126126+ libcCross
127127+ libmpc
128128+ libxcrypt
129129+ mpfr
130130+ name
131131+ noSysDirs
132132+ patchelf
133133+ perl
134134+ profiledCompiler
135135+ reproducibleBuild
136136+ staticCompiler
137137+ stdenv
138138+ targetPackages
139139+ texinfo
140140+ threadsCross
141141+ which
142142+ zip
143143+ zlib
144144+ ;
145145+ };
146146+86147in
8714888149stdenv.mkDerivation ({
···158219 inherit noSysDirs staticCompiler crossStageStatic
159220 libcCross crossMingw;
160221161161- inherit (import ../common/dependencies.nix {
162162- inherit
163163- lib
164164- stdenv
165165- buildPackages
166166- targetPackages
167167- crossStageStatic
168168- threadsCross
169169- langAda
170170- libxcrypt
171171- gnatboot
172172- version
173173- texinfo
174174- which
175175- gettext
176176- gnused
177177- patchelf
178178- gmp
179179- mpfr
180180- libmpc
181181- isl
182182- zlib
183183- zip
184184- perl
185185- ;
186186- }) depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
222222+ inherit (callFile ../common/dependencies.nix { })
223223+ depsBuildBuild nativeBuildInputs depsBuildTarget buildInputs depsTargetTarget;
187224188225 NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm";
189226190190- preConfigure = (import ../common/pre-configure.nix {
191191- inherit lib;
192192- inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib;
193193- }) + ''
227227+ preConfigure = (callFile ../common/pre-configure.nix { }) + ''
194228 ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h
195229 '';
196230···198232199233 configurePlatforms = [ "build" "host" "target" ];
200234201201- configureFlags = import ../common/configure-flags.nix {
202202- inherit
203203- lib
204204- stdenv
205205- targetPackages
206206- crossStageStatic libcCross threadsCross
207207- version
208208-209209- binutils gmp mpfr libmpc isl
210210-211211- enableLTO
212212- enableMultilib
213213- enablePlugin
214214- enableShared
215215-216216- langC
217217- langD
218218- langCC
219219- langFortran
220220- langAda
221221- langGo
222222- langObjC
223223- langObjCpp
224224- langJit
225225- ;
226226- };
235235+ configureFlags = callFile ../common/configure-flags.nix { };
227236228237 targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
229238···231240 (targetPlatform == hostPlatform && hostPlatform == buildPlatform)
232241 (if profiledCompiler then "profiledbootstrap" else "bootstrap");
233242234234- inherit
235235- (import ../common/strip-attributes.nix { inherit lib stdenv langJit; })
243243+ inherit (callFile ../common/strip-attributes.nix { })
236244 stripDebugList
237245 stripDebugListTarget
238246 preFixup;
···255263256264 LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib));
257265258258- inherit
259259- (import ../common/extra-target-flags.nix {
260260- inherit lib stdenv crossStageStatic langD libcCross threadsCross;
261261- })
266266+ inherit (callFile ../common/extra-target-flags.nix { })
262267 EXTRA_FLAGS_FOR_TARGET
263268 EXTRA_LDFLAGS_FOR_TARGET
264269 ;
···272277 inherit enableMultilib enableShared;
273278274279 meta = {
275275- homepage = "https://gcc.gnu.org/";
276276- license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
277277- description = "GNU Compiler Collection, version ${version}";
278278-279279- longDescription = ''
280280- The GNU Compiler Collection includes compiler front ends for C, C++,
281281- Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as
282282- libraries for these languages (libstdc++, libgomp,...).
283283-284284- GCC development is a part of the GNU Project, aiming to improve the
285285- compiler used in the GNU system including the GNU/Linux variant.
286286- '';
287287-288288- maintainers = lib.teams.gcc.members;
289289-290290- platforms = lib.platforms.unix;
280280+ inherit (callFile ../common/meta.nix { })
281281+ homepage
282282+ license
283283+ description
284284+ longDescription
285285+ platforms
286286+ maintainers
287287+ ;
291288 badPlatforms = [ "aarch64-darwin" ];
292289 };
290290+293291}
294292295293// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
···11+{ lib, version, }:
22+33+with lib; {
44+ homepage = "https://gcc.gnu.org/";
55+ license = licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
66+ description = "GNU Compiler Collection, version ${version}";
77+ longDescription = ''
88+ The GNU Compiler Collection includes compiler front ends for C, C++,
99+ Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as
1010+ libraries for these languages (libstdc++, libgomp,...).
1111+1212+ GCC development is a part of the GNU Project, aiming to improve the
1313+ compiler used in the GNU system including the GNU/Linux variant.
1414+ '';
1515+1616+ platforms = platforms.unix;
1717+ maintainers = if versionOlder version "5" then [ maintainers.veprbl ] else teams.gcc.members;
1818+1919+}
···11-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.102/ -A '*.tar.xz' )
11+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.103/ -A '*.tar.xz' )
···22703227032270422704 prospector = callPackage ../development/tools/prospector { };
22705227052270622706- # https://github.com/protocolbuffers/protobuf/issues/10418
2270722707- # protobuf versions have to match between build-time and run-time
2270822708- # Using "targetPlatform" in the check makes sure that the version of
2270922709- # pkgsCross.armv7l-hf-multiplatform.buildPackages.protobuf matches the
2271022710- # version of pkgsCross.armv7l-hf-multiplatform.protobuf
2271122711- protobuf = if stdenv.targetPlatform.is32bit then protobuf3_20 else
2271222712- protobuf3_21;
2270622706+ protobuf = protobuf3_21;
22713227072271422708 protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix { };
2271522709 protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { };