···66 <literal>enableParallelBuilding=false</literal>.
67 </para>
68 </listitem>
69+ <listitem>
70+ <para>
71+ <literal>pkgs.claws-mail-gtk2</literal>, representing Claws
72+ Mail’s older release version three, was removed in order to
73+ get rid of Python 2. Please switch to
74+ <literal>claws-mail</literal>, which is Claws Mail’s latest
75+ release based on GTK+3 and Python 3.
76+ </para>
77+ </listitem>
78 </itemizedlist>
79 </section>
80 <section xml:id="sec-release-22.05-notable-changes">
+3
nixos/doc/manual/release-notes/rl-2205.section.md
···2930- The `wafHook` hook now honors `NIX_BUILD_CORES` when `enableParallelBuilding` is not set explicitly. Packages can restore the old behaviour by setting `enableParallelBuilding=false`.
3100032## Other Notable Changes {#sec-release-22.05-notable-changes}
···2930- The `wafHook` hook now honors `NIX_BUILD_CORES` when `enableParallelBuilding` is not set explicitly. Packages can restore the old behaviour by setting `enableParallelBuilding=false`.
3132+- `pkgs.claws-mail-gtk2`, representing Claws Mail's older release version three, was removed in order to get rid of Python 2.
33+ Please switch to `claws-mail`, which is Claws Mail's latest release based on GTK+3 and Python 3.
34+35## Other Notable Changes {#sec-release-22.05-notable-changes}
···16 "hledger-check-fancyassertions"
17 {
18 libraries = with haskellPackages; [
19- base base-compat base-compat-batteries filepath hledger-lib_1_23
20 megaparsec microlens optparse-applicative string-qq text time
21 transformers
22 ];
···16 "hledger-check-fancyassertions"
17 {
18 libraries = with haskellPackages; [
19+ base base-compat base-compat-batteries filepath hledger-lib_1_24
20 megaparsec microlens optparse-applicative string-qq text time
21 transformers
22 ];
+2-2
pkgs/applications/video/kodi/unwrapped.nix
···198 '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
199 # Need these tools on the build system when cross compiling,
200 # hacky, but have found no other way.
201- CXX=${stdenv.cc.targetPrefix}c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder
202 cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin"
203204- CXX=${stdenv.cc.targetPrefix}c++ LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker
205 cmakeFlags+=" -DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin"
206 '';
207
···198 '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
199 # Need these tools on the build system when cross compiling,
200 # hacky, but have found no other way.
201+ CXX=$CXX_FOR_BUILD LD=ld make -C tools/depends/native/JsonSchemaBuilder
202 cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin"
203204+ CXX=$CXX_FOR_BUILD LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker
205 cmakeFlags+=" -DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin"
206 '';
207
···309 with open(path, 'r') as f:
310 text = f.read()
311312- # Determine pname.
313- pname = _get_unique_value('pname', text)
314315 # Determine version.
316 version = _get_unique_value('version', text)
···320321 extension = _determine_extension(text, fetcher)
322323- new_version, new_sha256, prefix = FETCHERS[fetcher](pname, extension, version, target)
00000000000324325 if new_version == version:
326 logging.info("Path {}: no update available for {}.".format(path, pname))
···331 raise ValueError("no file available for {}.".format(pname))
332333 text = _replace_value('version', new_version, text)
334- text = _replace_value('sha256', new_sha256, text)
00000000335 if fetcher == 'fetchFromGitHub':
336 text = _replace_value('rev', f"{prefix}${{version}}", text)
337 # incase there's no prefix, just rewrite without interpolation
···309 with open(path, 'r') as f:
310 text = f.read()
311312+ # Determine pname. Many files have more than one pname
313+ pnames = _get_values('pname', text)
314315 # Determine version.
316 version = _get_unique_value('version', text)
···320321 extension = _determine_extension(text, fetcher)
322323+ # Attempt a fetch using each pname, e.g. backports-zoneinfo vs backports.zoneinfo
324+ successful_fetch = False
325+ for pname in pnames:
326+ try:
327+ new_version, new_sha256, prefix = FETCHERS[fetcher](pname, extension, version, target)
328+ successful_fetch = True
329+ break
330+ except ValueError:
331+ continue
332+333+ if not successful_fetch:
334+ raise ValueError(f"Unable to find correct package using these pnames: {pnames}")
335336 if new_version == version:
337 logging.info("Path {}: no update available for {}.".format(path, pname))
···342 raise ValueError("no file available for {}.".format(pname))
343344 text = _replace_value('version', new_version, text)
345+346+ # fetchers can specify a sha256, or a sri hash
347+ try:
348+ text = _replace_value('sha256', new_sha256, text)
349+ except ValueError:
350+ # hashes from pypi are 16-bit encoded sha256's, need translate to an sri hash if used with "hash"
351+ sri_hash = subprocess.check_output(["nix", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip()
352+ text = _replace_value('hash', sri_hash, text)
353+354 if fetcher == 'fetchFromGitHub':
355 text = _replace_value('rev', f"{prefix}${{version}}", text)
356 # incase there's no prefix, just rewrite without interpolation
···1-commit b6172952c0150d84912fa6f09bab782dd0549f1e
2-Author: Austin Seipp <aseipp@pobox.com>
3-Date: Fri May 3 00:47:12 2019 -0500
4-5- src: special case nix build directories for clang
6-7- Signed-off-by: Austin Seipp <aseipp@pobox.com>
8-9-diff --git a/src/clang_parser.cpp b/src/clang_parser.cpp
10-index b1db8ff..0cfb01f 100644
11---- a/src/utils.cpp
12-+++ b/src/utils.cpp
13-@@ -140,6 +140,9 @@ static bool is_dir(const std::string& path)
14- // Both ksrc and kobj are guaranteed to be != "", if at least some trace of kernel sources was found.
15- std::tuple<std::string, std::string> get_kernel_dirs(const struct utsname& utsname)
16- {
17-+ // NB (aseipp): special case the kernel directory for nix
18-+ return { "@NIX_KERNEL_SRC@/source", "@NIX_KERNEL_SRC@/build" };
19-+
20- #ifdef KERNEL_HEADERS_DIR
21- return {KERNEL_HEADERS_DIR, KERNEL_HEADERS_DIR};
22- #endif
···0000000000000000000000
+6-1
pkgs/os-specific/linux/libbpf/default.nix
···23 enableParallelBuilding = true;
24 makeFlags = [ "PREFIX=$(out)" ];
250000026 # FIXME: Multi-output requires some fixes to the way the pkg-config file is
27 # constructed (it gets put in $out instead of $dev for some reason, with
28 # improper paths embedded). Don't enable it for now.
···33 description = "Upstream mirror of libbpf";
34 homepage = "https://github.com/libbpf/libbpf";
35 license = with licenses; [ lgpl21 /* or */ bsd2 ];
36- maintainers = with maintainers; [ thoughtpolice vcunat saschagrunert ];
37 platforms = platforms.linux;
38 };
39}
···23 enableParallelBuilding = true;
24 makeFlags = [ "PREFIX=$(out)" ];
2526+ postInstall = ''
27+ # install linux's libbpf-compatible linux/btf.h
28+ install -Dm444 ../include/uapi/linux/btf.h -t $out/include/linux
29+ '';
30+31 # FIXME: Multi-output requires some fixes to the way the pkg-config file is
32 # constructed (it gets put in $out instead of $dev for some reason, with
33 # improper paths embedded). Don't enable it for now.
···38 description = "Upstream mirror of libbpf";
39 homepage = "https://github.com/libbpf/libbpf";
40 license = with licenses; [ lgpl21 /* or */ bsd2 ];
41+ maintainers = with maintainers; [ thoughtpolice vcunat saschagrunert martinetd ];
42 platforms = platforms.linux;
43 };
44}