ea64a12 · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge master into staging-next

commitea64a128d1ed70c40ce897d0d8cc569e2eb394cd authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> dateMon 14 Mar 2022, 00:02 (5 years ago) parent3891035 1073633

90 files changed+742−424

compare with master

unifiedsplit

doc/functions/library/attrsets.xml+1−1

@@ -1474,7 +1474,7 @@ lib.attrsets.zipAttrsWith

14741474 <section xml:id="function-library-lib.attrsets.zipAttrs">

14751475 <title><function>lib.attrsets.zipAttrs</function></title>

14761476

1477− <subtitle><literal>zipAttrsWith :: [ AttrSet ] -> AttrSet</literal>

1477+ <subtitle><literal>zipAttrs :: [ AttrSet ] -> AttrSet</literal>

14781478 </subtitle>

14791479

14801480 <xi:include href="./locations.xml" xpointer="lib.attrsets.zipAttrs" />

doc/languages-frameworks/ocaml.section.md+2−2

@@ -38,8 +38,8 @@ Here is a simple package example.

3838

3939- It uses the `fetchFromGitHub` fetcher to get its source.

4040

41−- `useDune2 = true` ensures that the latest version of Dune is used for the

42− build (this may become the default value in a future release).

41+- `useDune2 = true` ensures that Dune version 2 is used for the

42+ build (this is the default; set to `false` to use Dune version 1).

4343

4444- It sets the optional `doCheck` attribute such that tests will be run with

4545 `dune runtest -p angstrom` after the build (`dune build -p angstrom`) is

nixos/doc/manual/development/writing-modules.chapter.md+42

@@ -90,6 +90,17 @@ modules: `systemd.services` (the set of all systemd services) and

9090`systemd.timers` (the list of commands to be executed periodically by

9191`systemd`).

9292

93+Care must be taken when writing systemd services using `Exec*` directives. By

94+default systemd performs substitution on `%<char>` specifiers in these

95+directives, expands environment variables from `$FOO` and `${FOO}`, splits

96+arguments on whitespace, and splits commands on `;`. All of these must be escaped

97+to avoid unexpected substitution or splitting when interpolating into an `Exec*`

98+directive, e.g. when using an `extraArgs` option to pass additional arguments to

99+the service. The functions `utils.escapeSystemdExecArg` and

100+`utils.escapeSystemdExecArgs` are provided for this, see [Example: Escaping in

101+Exec directives](#exec-escaping-example) for an example. When using these

102+functions system environment substitution should *not* be disabled explicitly.

103+

93104::: {#locate-example .example}

94105::: {.title}

95106**Example: NixOS Module for the "locate" Service**

@@ -153,6 +164,37 @@ in {

153164```

154165:::

155166

167+::: {#exec-escaping-example .example}

168+::: {.title}

169+**Example: Escaping in Exec directives**

170+:::

171+```nix

172+{ config, lib, pkgs, utils, ... }:

173+

174+with lib;

175+

176+let

177+ cfg = config.services.echo;

178+ echoAll = pkgs.writeScript "echo-all" ''

179+ #! ${pkgs.runtimeShell}

180+ for s in "$@"; do

181+ printf '%s\n' "$s"

182+ done

183+ '';

184+ args = [ "a%Nything" "lang=\${LANG}" ";" "/bin/sh -c date" ];

185+in {

186+ systemd.services.echo =

187+ { description = "Echo to the journal";

188+ wantedBy = [ "multi-user.target" ];

189+ serviceConfig.Type = "oneshot";

190+ serviceConfig.ExecStart = ''

191+ ${echoAll} ${utils.escapeSystemdExecArgs args}

192+ '';

193+ };

194+}

195+```

196+:::

197+

156198```{=docbook}

157199<xi:include href="option-declarations.section.xml" />

158200<xi:include href="option-types.section.xml" />

nixos/doc/manual/from_md/development/writing-modules.chapter.xml+49

@@ -122,6 +122,25 @@

122122 services) and <literal>systemd.timers</literal> (the list of

123123 commands to be executed periodically by <literal>systemd</literal>).

124124 </para>

125+ <para>

126+ Care must be taken when writing systemd services using

127+ <literal>Exec*</literal> directives. By default systemd performs

128+ substitution on <literal>%<char></literal> specifiers in these

129+ directives, expands environment variables from

130+ <literal>$FOO</literal> and <literal>${FOO}</literal>, splits

131+ arguments on whitespace, and splits commands on

132+ <literal>;</literal>. All of these must be escaped to avoid

133+ unexpected substitution or splitting when interpolating into an

134+ <literal>Exec*</literal> directive, e.g. when using an

135+ <literal>extraArgs</literal> option to pass additional arguments to

136+ the service. The functions

137+ <literal>utils.escapeSystemdExecArg</literal> and

138+ <literal>utils.escapeSystemdExecArgs</literal> are provided for

139+ this, see <link linkend="exec-escaping-example">Example: Escaping in

140+ Exec directives</link> for an example. When using these functions

141+ system environment substitution should <emphasis>not</emphasis> be

142+ disabled explicitly.

143+ </para>

125144 <anchor xml:id="locate-example" />

126145 <para>

127146 <emphasis role="strong">Example: NixOS Module for the

@@ -183,6 +202,36 @@ in {

183202 };

184203 };

185204}

205+</programlisting>

206+ <anchor xml:id="exec-escaping-example" />

207+ <para>

208+ <emphasis role="strong">Example: Escaping in Exec

209+ directives</emphasis>

210+ </para>

211+ <programlisting language="bash">

212+{ config, lib, pkgs, utils, ... }:

213+

214+with lib;

215+

216+let

217+ cfg = config.services.echo;

218+ echoAll = pkgs.writeScript "echo-all" ''

219+ #! ${pkgs.runtimeShell}

220+ for s in "$@"; do

221+ printf '%s\n' "$s"

222+ done

223+ '';

224+ args = [ "a%Nything" "lang=\${LANG}" ";" "/bin/sh -c date" ];

225+in {

226+ systemd.services.echo =

227+ { description = "Echo to the journal";

228+ wantedBy = [ "multi-user.target" ];

229+ serviceConfig.Type = "oneshot";

230+ serviceConfig.ExecStart = ''

231+ ${echoAll} ${utils.escapeSystemdExecArgs args}

232+ '';

233+ };

234+}

186235</programlisting>

187236 <xi:include href="option-declarations.section.xml" />

188237 <xi:include href="option-types.section.xml" />

nixos/lib/utils.nix+20

@@ -45,6 +45,26 @@ rec {

4545 replaceChars ["/" "-" " "] ["-" "\\x2d" "\\x20"]

4646 (removePrefix "/" s);

4747

48+ # Quotes an argument for use in Exec* service lines.

49+ # systemd accepts "-quoted strings with escape sequences, toJSON produces

50+ # a subset of these.

51+ # Additionally we escape % to disallow expansion of % specifiers. Any lone ;

52+ # in the input will be turned it ";" and thus lose its special meaning.

53+ # Every $ is escaped to $$, this makes it unnecessary to disable environment

54+ # substitution for the directive.

55+ escapeSystemdExecArg = arg:

56+ let

57+ s = if builtins.isPath arg then "${arg}"

58+ else if builtins.isString arg then arg

59+ else if builtins.isInt arg || builtins.isFloat arg then toString arg

60+ else throw "escapeSystemdExecArg only allows strings, paths and numbers";

61+ in

62+ replaceChars [ "%" "$" ] [ "%%" "$$" ] (builtins.toJSON s);

63+

64+ # Quotes a list of arguments into a single string for use in a Exec*

65+ # line.

66+ escapeSystemdExecArgs = concatMapStringsSep " " escapeSystemdExecArg;

67+

4868 # Returns a system path for a given shell package

4969 toShellPath = shell:

5070 if types.shellPackage.check shell then

nixos/modules/services/web-servers/tomcat.nix+4−3

@@ -23,8 +23,8 @@ in

2323

2424 package = mkOption {

2525 type = types.package;

26− default = pkgs.tomcat85;

27− defaultText = literalExpression "pkgs.tomcat85";

26+ default = pkgs.tomcat9;

27+ defaultText = literalExpression "pkgs.tomcat9";

2828 example = lib.literalExpression "pkgs.tomcat9";

2929 description = ''

3030 Which tomcat package to use.

@@ -127,7 +127,7 @@ in

127127 webapps = mkOption {

128128 type = types.listOf types.path;

129129 default = [ tomcat.webapps ];

130− defaultText = literalExpression "[ pkgs.tomcat85.webapps ]";

130+ defaultText = literalExpression "[ config.services.tomcat.package.webapps ]";

131131 description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat";

132132 };

133133

@@ -201,6 +201,7 @@ in

201201 { uid = config.ids.uids.tomcat;

202202 description = "Tomcat user";

203203 home = "/homeless-shelter";

204+ group = "tomcat";

204205 extraGroups = cfg.extraGroups;

205206 };

206207

nixos/tests/all-tests.nix+2

@@ -503,6 +503,7 @@ in

503503 systemd-boot = handleTest ./systemd-boot.nix {};

504504 systemd-confinement = handleTest ./systemd-confinement.nix {};

505505 systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix {};

506+ systemd-escaping = handleTest ./systemd-escaping.nix {};

506507 systemd-journal = handleTest ./systemd-journal.nix {};

507508 systemd-machinectl = handleTest ./systemd-machinectl.nix {};

508509 systemd-networkd = handleTest ./systemd-networkd.nix {};

@@ -524,6 +525,7 @@ in

524525 tinc = handleTest ./tinc {};

525526 tinydns = handleTest ./tinydns.nix {};

526527 tinywl = handleTest ./tinywl.nix {};

528+ tomcat = handleTest ./tomcat.nix {};

527529 tor = handleTest ./tor.nix {};

528530 # traefik test relies on docker-containers

529531 traefik = handleTestOn ["x86_64-linux"] ./traefik.nix {};

nixos/tests/empty-filenew file

No changes to the content.

nixos/tests/systemd-escaping.nixnew file+45

@@ -0,0 +1,45 @@

1+import ./make-test-python.nix ({ pkgs, ... }:

3+let

4+ echoAll = pkgs.writeScript "echo-all" ''

5+ #! ${pkgs.runtimeShell}

6+ for s in "$@"; do

7+ printf '%s\n' "$s"

8+ done

9+ '';

10+ # deliberately using a local empty file instead of pkgs.emptyFile to have

11+ # a non-store path in the test

12+ args = [ "a%Nything" "lang=\${LANG}" ";" "/bin/sh -c date" ./empty-file 4.2 23 ];

13+in

14+{

15+ name = "systemd-escaping";

16+

17+ machine = { pkgs, lib, utils, ... }: {

18+ systemd.services.echo =

19+ assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ [] ])).success;

20+ assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ {} ])).success;

21+ assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ null ])).success;

22+ assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ false ])).success;

23+ assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ (_:_) ])).success;

24+ { description = "Echo to the journal";

25+ serviceConfig.Type = "oneshot";

26+ serviceConfig.ExecStart = ''

27+ ${echoAll} ${utils.escapeSystemdExecArgs args}

28+ '';

29+ };

30+ };

31+

32+ testScript = ''

33+ machine.wait_for_unit("multi-user.target")

34+ machine.succeed("systemctl start echo.service")

35+ # skip the first 'Starting <service> ...' line

36+ logs = machine.succeed("journalctl -u echo.service -o cat").splitlines()[1:]

37+ assert "a%Nything" == logs[0]

38+ assert "lang=''${LANG}" == logs[1]

39+ assert ";" == logs[2]

40+ assert "/bin/sh -c date" == logs[3]

41+ assert "/nix/store/ij3gw72f4n5z4dz6nnzl1731p9kmjbwr-empty-file" == logs[4]

42+ assert "4.2" in logs[5] # toString produces extra fractional digits!

43+ assert "23" == logs[6]

44+ '';

45+})

nixos/tests/tomcat.nixnew file+21

@@ -0,0 +1,21 @@

1+import ./make-test-python.nix ({ pkgs, ... }:

3+{

4+ name = "tomcat";

6+ machine = { pkgs, ... }: {

7+ services.tomcat.enable = true;

8+ };

10+ testScript = ''

11+ machine.wait_for_unit("tomcat.service")

12+ machine.wait_for_open_port(8080)

13+ machine.wait_for_file("/var/tomcat/webapps/examples");

14+ machine.succeed(

15+ "curl --fail http://localhost:8080/examples/servlets/servlet/HelloWorldExample | grep 'Hello World!'"

16+ )

17+ machine.succeed(

18+ "curl --fail http://localhost:8080/examples/jsp/jsp2/simpletag/hello.jsp | grep 'Hello, world!'"

19+ )

20+ '';

21+})

pkgs/applications/emulators/cdemu/vhba.nix+1−1

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {

99 sha256 = "sha256-csWowcRSgF5M74yv787MLSXOGXrkxnODCCgC5a3Nd7Y=";

1010 };

1111

12− makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ];

12+ makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ];

1313 nativeBuildInputs = kernel.moduleBuildDependencies;

1414

1515 meta = with lib; {

pkgs/applications/misc/mediaelch/default.nix+2−2

@@ -18,13 +18,13 @@

1818

1919mkDerivation rec {

2020 pname = "mediaelch";

21− version = "2.8.14";

21+ version = "2.8.16";

2222

2323 src = fetchFromGitHub {

2424 owner = "Komet";

2525 repo = "MediaElch";

2626 rev = "v${version}";

27− sha256 = "sha256-yHThX5Xs+8SijNKgmg+4Mawbwi3zHA/DJQoIBy0Wchs=";

27+ sha256 = "sha256-83bHfIRVAC+3RkCYmV+TBjjQxaFMHfVyxt5Jq44dzeI=";

2828 fetchSubmodules = true;

2929 };

3030

pkgs/applications/networking/cluster/terraform-providers/update-all-providers+8−5

@@ -5,7 +5,7 @@

55# Update all providers which have specified provider source address

66set -euo pipefail

8−providers=$(

8+readarray -t providers < <(

99 jq -r 'to_entries

1010 | map_values(.value + { alias: .key })

1111 | .[]

@@ -13,10 +13,13 @@ providers=$(

1313 | .alias' providers.json

1414)

1515

16−echo "Will update providers:"

17−echo "${providers}"

16+cat <<EOF

17+Will update ${#providers[@]} providers:

1818

19−for provider in ${providers}; do

20− echo "Updating ${provider}"

19+${providers[*]}

20+

21+EOF

22+

23+for provider in "${providers[@]}"; do

2124 ./update-provider "$@" "${provider}"

2225done

pkgs/applications/networking/cluster/terraform-providers/update-provider+34−36

@@ -1,5 +1,5 @@

11#!/usr/bin/env nix-shell

2−#! nix-shell -I nixpkgs=../../../../.. -i bash -p coreutils curl jq moreutils nix nix-prefetch

2+#! nix-shell -I nixpkgs=../../../../.. -i bash -p coreutils curl git jq moreutils nix nix-prefetch

33# shellcheck shell=bash

44# vim: ft=sh

55#

@@ -75,45 +75,46 @@ if [[ -z ${provider} ]]; then

7575 exit 1

7676fi

7777

78−provider_name=$(basename "${provider}")

79−

8078# Usage: read_attr <key>

8179read_attr() {

82− jq -r ".\"${provider_name}\".\"$1\"" providers.json

80+ jq -r ".\"${provider}\".\"$1\"" providers.json

8381}

8482

8583# Usage: update_attr <key> <value>

8684update_attr() {

8785 if [[ $2 == "null" ]]; then

88− jq -S ".\"${provider_name}\".\"$1\" = null" providers.json | sponge providers.json

86+ jq -S ".\"${provider}\".\"$1\" = null" providers.json | sponge providers.json

8987 else

90− jq -S ".\"${provider_name}\".\"$1\" = \"$2\"" providers.json | sponge providers.json

88+ jq -S ".\"${provider}\".\"$1\" = \"$2\"" providers.json | sponge providers.json

9189 fi

9290}

9391

94−prefetch_github() {

95− # of a given owner, repo and rev, fetch the tarball and return the output of

96− # `nix-prefetch-url`

97− local owner=$1

98− local repo=$2

99− local rev=$3

100− nix-prefetch-url --unpack "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"

92+repo_root=$(git rev-parse --show-toplevel)

93+

94+generate_hash() {

95+ nix-prefetch -I nixpkgs="${repo_root}" \

96+ "{ sha256 }: (import ${repo_root} {}).terraform-providers.${provider}.$1.overrideAttrs (_: { $2 = sha256; })"

10197}

10298

103−old_source_address="$(read_attr provider-source-address)"

104−old_vendor_sha256=$(read_attr vendorSha256)

105−old_version=$(read_attr version)

99+echo_provider() {

100+ echo "== terraform-providers.${provider}: $* =="

101+}

106102

107103if [[ ${provider} =~ ^[^/]+/[^/]+$ ]]; then

104+ echo_provider "init"

108105 source_address=registry.terraform.io/${provider}

106+ provider=$(basename "${provider}")

107+ update_attr "provider-source-address" "${source_address}"

108+ update_attr version "0"

109+ # create empty stings so nix-prefetch works

110+ update_attr sha256 ""

111+ update_attr vendorSha256 ""

109112else

110− source_address=${old_source_address}

111−fi

112−if [[ ${source_address} == "null" ]]; then

113− echo "Could not find the source address for provider: ${provider}"

114− exit 1

113+ source_address="$(read_attr provider-source-address)"

115114fi

116−update_attr "provider-source-address" "${source_address}"

115+

116+old_vendor_sha256=$(read_attr vendorSha256)

117+old_version=$(read_attr version)

117118

118119# The provider source address (used inside Terraform `required_providers` block) is

119120# used to compute the registry API endpoint

@@ -125,8 +126,10 @@ registry_response=$(curl -s https://"${source_address/\///v1/providers/}")

125126

126127version="$(jq -r '.version' <<<"${registry_response}")"

127128if [[ ${old_version} == "${version}" && ${force} != 1 && -z ${vendorSha256} && ${old_vendor_sha256} != "${vendorSha256}" ]]; then

128− echo "${provider_name} is already at version ${version}"

129+ echo_provider "already at version ${version}"

129130 exit

131+else

132+ echo_provider "updating from ${old_version} to ${version}"

130133fi

131134update_attr version "${version}"

132135

@@ -138,28 +141,23 @@ repo="$(echo "${provider_source_url}" | cut -d '/' -f 5)"

138141update_attr repo "${repo}"

139142rev="$(jq -r '.tag' <<<"${registry_response}")"

140143update_attr rev "${rev}"

141−sha256=$(prefetch_github "${org}" "${repo}" "${rev}")

144+echo_provider "calculating sha256"

145+sha256=$(generate_hash src outputHash)

142146update_attr sha256 "${sha256}"

143147

144148if [[ -z ${vendorSha256} ]]; then

145149 if [[ ${old_vendor_sha256} == null ]]; then

146150 vendorSha256=null

147− elif [[ -n ${old_vendor_sha256} ]]; then

148− echo "=== Calculating vendorSha256 ==="

149− vendorSha256=$(nix-prefetch -I nixpkgs=../../../../.. "{ sha256 }: (import ../../../../.. {}).terraform-providers.${provider_name}.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })")

150− # Deal with nix unstable

151− if [[ ${vendorSha256} == sha256-* ]]; then

152− vendorSha256=$(nix --extra-experimental-features nix-command hash to-base32 "${vendorSha256}")

153− fi

151+ else

152+ echo_provider "calculating vendorSha256"

153+ vendorSha256=$(generate_hash go-modules vendorSha256)

154154 fi

155155fi

156156

157−if [[ -n ${vendorSha256} ]]; then

158− update_attr vendorSha256 "${vendorSha256}"

159−fi

157+update_attr vendorSha256 "${vendorSha256}"

160158

161159# Check that the provider builds

162160if [[ ${build} == 1 ]]; then

163− echo "=== Building terraform-providers.${provider_name} ==="

164− nix-build --no-out-link ../../../../.. -A "terraform-providers.${provider_name}"

161+ echo_provider "building"

162+ nix-build --no-out-link "${repo_root}" -A "terraform-providers.${provider}"

165163fi

pkgs/applications/networking/instant-messengers/signal-desktop/default.nix+2−2

@@ -24,7 +24,7 @@ let

2424

2525in stdenv.mkDerivation rec {

2626 pname = "signal-desktop";

27− version = "5.34.0"; # Please backport all updates to the stable channel.

27+ version = "5.35.0"; # Please backport all updates to the stable channel.

2828 # All releases have a limited lifetime and "expire" 90 days after the release.

2929 # When releases "expire" the application becomes unusable until an update is

3030 # applied. The expiration date for the current release can be extracted with:

@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {

3434

3535 src = fetchurl {

3636 url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";

37− sha256 = "sha256-uU4WJtd9qwrjHgsK0oDg/pCf/5lfNhoMDEd/lHUnLwk=";

37+ sha256 = "sha256-2KF2OLq6/vHElgloxn+kgQisJC+HAkpOBfsKfEPW35c=";

3838 };

3939

4040 nativeBuildInputs = [

pkgs/build-support/fetchurl/mirrors.nix+260−233

@@ -1,6 +1,6 @@

11{

3− # Content-addressable Nix mirrors.

3+ # Content-addressable Nix mirrors

44 hashedMirrors = [

55 "https://tarballs.nixos.org"

66 ];

@@ -8,37 +8,73 @@

88 # Mirrors for mirror://site/filename URIs, where "site" is

99 # "sourceforge", "gnu", etc.

1010

11− luarocks = [

12− "https://luarocks.org/"

13− "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/"

14− "https://luafr.org/moonrocks/"

15− "http://luarocks.logiceditor.com/rocks/"

11+ # Alsa Project

12+ alsa = [

13+ "https://www.alsa-project.org/files/pub/"

14+ "ftp://ftp.alsa-project.org/pub/"

15+ "http://alsa.cybermirror.org/"

16+ "http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/"

1617 ];

1718

18− # SourceForge.

19− sourceforge = [

20− "https://downloads.sourceforge.net/"

21− "https://prdownloads.sourceforge.net/"

22− "https://netcologne.dl.sourceforge.net/sourceforge/"

23− "https://versaweb.dl.sourceforge.net/sourceforge/"

24− "https://freefr.dl.sourceforge.net/sourceforge/"

25− "https://osdn.dl.sourceforge.net/sourceforge/"

26− "https://kent.dl.sourceforge.net/sourceforge/"

19+ # Apache

20+ apache = [

21+ "https://www-eu.apache.org/dist/"

22+ "https://ftp.wayne.edu/apache/"

23+ "https://www.apache.org/dist/"

24+ "https://archive.apache.org/dist/" # fallback for old releases

25+ "https://apache.cs.uu.nl/"

26+ "https://apache.cs.utah.edu/"

27+ "http://ftp.tudelft.nl/apache/"

28+ "ftp://ftp.funet.fi/pub/mirrors/apache.org/"

2729 ];

2830

29− # OSDN (formerly SourceForge.jp).

30− osdn = [

31− "https://osdn.dl.osdn.jp/"

32− "https://osdn.mirror.constant.com/"

33− "https://mirrors.gigenet.com/OSDN/"

34− "https://osdn.dl.sourceforge.jp/"

35− "https://jaist.dl.sourceforge.jp/"

31+ # Bioconductor mirrors (from https://bioconductor.org/about/mirrors/)

32+ # The commented-out ones don't seem to allow direct package downloads;

33+ # they serve error messages that result in hash mismatches instead

34+ bioc = [

35+ # http://bioc.ism.ac.jp/

36+ # http://bioc.openanalytics.eu/

37+ # http://bioconductor.fmrp.usp.br/

38+ # http://mirror.aarnet.edu.au/pub/bioconductor/

39+ # http://watson.nci.nih.gov/bioc_mirror/

40+ "https://bioconductor.statistik.tu-dortmund.de/packages/"

41+ "https://mirrors.ustc.edu.cn/bioc/"

42+ "http://bioconductor.jp/packages/"

43+ ];

44+

45+ # BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html

46+ bitlbee = [

47+ "https://get.bitlbee.org/"

48+ "https://ftp.snt.utwente.nl/pub/software/bitlbee/"

49+ "http://bitlbee.intergenia.de/"

50+ ];

51+

52+ # GCC

53+ gcc = [

54+ "https://bigsearcher.com/mirrors/gcc/"

55+ "https://mirror.koddos.net/gcc/"

56+ "ftp://ftp.nluug.nl/mirror/languages/gcc/"

57+ "ftp://ftp.fu-berlin.de/unix/languages/gcc/"

58+ "ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/"

59+ "ftp://gcc.gnu.org/pub/gcc/"

60+ ];

61+

62+ # GNOME

63+ gnome = [

64+ # This one redirects to some mirror closeby, so it should be all you need

65+ "https://download.gnome.org/"

66+

67+ "https://fr2.rpmfind.net/linux/gnome.org/"

68+ "https://ftp.acc.umu.se/pub/GNOME/"

69+ "https://ftp.belnet.be/mirror/ftp.gnome.org/"

70+ "ftp://ftp.cse.buffalo.edu/pub/Gnome/"

71+ "ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/"

3672 ];

3773

38− # GNU (https://www.gnu.org/prep/ftp.html).

74+ # GNU (https://www.gnu.org/prep/ftp.html)

3975 gnu = [

4076 # This one redirects to a (supposedly) nearby and (supposedly) up-to-date

41− # mirror.

77+ # mirror

4278 "https://ftpmirror.gnu.org/"

4379

4480 "https://ftp.nluug.nl/pub/gnu/"

@@ -47,23 +83,13 @@

4783 "https://mirror.dogado.de/gnu/"

4884 "https://mirror.tochlab.net/pub/gnu/"

4985

50− # This one is the master repository, and thus it's always up-to-date.

86+ # This one is the master repository, and thus it's always up-to-date

5187 "https://ftp.gnu.org/pub/gnu/"

5288

5389 "ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/"

5490 ];

5591

56− # GCC.

57− gcc = [

58− "https://bigsearcher.com/mirrors/gcc/"

59− "https://mirror.koddos.net/gcc/"

60− "ftp://ftp.nluug.nl/mirror/languages/gcc/"

61− "ftp://ftp.fu-berlin.de/unix/languages/gcc/"

62− "ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/"

63− "ftp://gcc.gnu.org/pub/gcc/"

64− ];

65−

66− # GnuPG.

92+ # GnuPG

6793 gnupg = [

6894 "https://gnupg.org/ftp/gcrypt/"

6995 "https://mirrors.dotsrc.org/gcrypt/"

@@ -72,11 +98,13 @@

7298 "http://www.ring.gr.jp/pub/net/"

7399 ];

74100

75− # kernel.org's /pub (/pub/{linux,software}) tree.

76− kernel = [

77− "https://cdn.kernel.org/pub/"

78− "http://linux-kernel.uio.no/pub/"

79− "ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/"

101+ # ImageMagick mirrors, see https://www.imagemagick.org/script/mirror.php

102+ imagemagick = [

103+ "https://www.imagemagick.org/download/"

104+ "https://mirror.checkdomain.de/imagemagick/"

105+ "https://ftp.nluug.nl/ImageMagick/"

106+ "https://ftp.sunet.se/mirror/imagemagick.org/ftp/"

107+ "ftp://ftp.sunet.se/mirror/imagemagick.org/ftp/" # also contains older versions removed from most mirrors

80108 ];

81109

82110 # Mirrors from https://download.kde.org/ls-lR.mirrorlist

@@ -89,13 +117,105 @@

89117 "https://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/"

90118 ];

91119

92− # Gentoo files.

93− gentoo = [

94− "https://ftp.snt.utwente.nl/pub/os/linux/gentoo/"

95− "https://distfiles.gentoo.org/"

96− "https://mirrors.kernel.org/gentoo/"

120+ # kernel.org's /pub (/pub/{linux,software}) tree

121+ kernel = [

122+ "https://cdn.kernel.org/pub/"

123+ "http://linux-kernel.uio.no/pub/"

124+ "ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/"

125+ ];

126+

127+ # Metalab, now IBiblio

128+ metalab = [

129+ "ftp://ftp.gwdg.de/pub/linux/metalab/"

130+ "ftp://ftp.metalab.unc.edu/pub/linux/"

131+ ];

132+

133+ # MySQL

134+ mysql = [

135+ "https://cdn.mysql.com/Downloads/"

136+ ];

137+

138+ # Maven Central

139+ maven = [

140+ "https://repo1.maven.org/maven2/"

141+ ];

142+

143+ # Mozilla projects

144+ mozilla = [

145+ "https://download.cdn.mozilla.net/pub/mozilla.org/"

146+ "https://archive.mozilla.org/pub/"

147+ ];

148+

149+ # OSDN (formerly SourceForge.jp)

150+ osdn = [

151+ "https://osdn.dl.osdn.jp/"

152+ "https://osdn.mirror.constant.com/"

153+ "https://mirrors.gigenet.com/OSDN/"

154+ "https://osdn.dl.sourceforge.jp/"

155+ "https://jaist.dl.sourceforge.jp/"

156+ ];

157+

158+ # PostgreSQL

159+ postgresql = [

160+ "https://ftp.postgresql.org/pub/"

161+ ];

162+

163+ # Roy marples mirrors

164+ roy = [

165+ "https://roy.marples.name/downloads/"

166+ "https://cflags.cc/roy/"

167+ ];

168+

169+ # Sage mirrors (https://www.sagemath.org/mirrors.html)

170+ sageupstream = [

171+ # Africa (HTTPS)

172+ "https://sagemath.mirror.ac.za/spkg/upstream/"

173+ "https://mirror.ufs.ac.za/sagemath/spkg/upstream/"

174+

175+ # America, North (HTTPS)

176+ "https://mirrors.mit.edu/sage/spkg/upstream/"

177+ "https://mirrors.xmission.com/sage/spkg/upstream/"

178+

179+ # Asia (HTTPS)

180+ "https://mirrors.tuna.tsinghua.edu.cn/sagemath/spkg/upstream/"

181+ "https://mirrors.ustc.edu.cn/sagemath/spkg/upstream/"

182+ "http://ftp.tsukuba.wide.ad.jp/software/sage/spkg/upstream/"

183+ "https://ftp.yz.yamagata-u.ac.jp/pub/math/sage/spkg/upstream/"

184+ "https://mirror.yandex.ru/mirrors/sage.math.washington.edu/spkg/upstream/"

185+

186+ # Australia (HTTPS)

187+ "https://mirror.aarnet.edu.au/pub/sage/spkg/upstream/"

188+

189+ # Europe (HTTPS)

190+ "https://sage.mirror.garr.it/mirrors/sage/spkg/upstream/"

191+ "https://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream/"

192+

193+ # Africa (non-HTTPS)

194+ "ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/spkg/upstream/"

195+

196+ # America, North (non-HTTPS)

197+ "http://www.cecm.sfu.ca/sage/spkg/upstream/"

198+

199+ # America, South (non-HTTPS)

200+ "http://sagemath.c3sl.ufpr.br/spkg/upstream/"

201+ "http://linorg.usp.br/sage/spkg/upstream"

202+

203+ # Asia (non-HTTPS)

204+ "http://ftp.kaist.ac.kr/sage/spkg/upstream/"

205+ "http://ftp.riken.jp/sagemath/spkg/upstream/"

206+

207+ # Europe (non-HTTPS)

208+ "http://mirrors.fe.up.pt/pub/sage/spkg/upstream/"

209+ "http://ftp.ntua.gr/pub/sagemath/spkg/upstream/"

210+ ];

211+

212+ # SAMBA

213+ samba = [

214+ "https://www.samba.org/ftp/"

215+ "http://www.samba.org/ftp/"

97216 ];

98217

218+ # GNU Savannah

99219 savannah = [

100220 # Mirrors from https://download-mirror.savannah.gnu.org/releases/00_MIRRORS.html

101221 "https://mirror.easyname.at/nongnu/"

@@ -126,28 +246,56 @@

126246 "ftp://ftp.mirrorservice.org/sites/download.savannah.gnu.org/releases/"

127247 ];

128248

129− samba = [

130− "https://www.samba.org/ftp/"

131− "http://www.samba.org/ftp/"

249+ # SourceForge

250+ sourceforge = [

251+ "https://downloads.sourceforge.net/"

252+ "https://prdownloads.sourceforge.net/"

253+ "https://netcologne.dl.sourceforge.net/sourceforge/"

254+ "https://versaweb.dl.sourceforge.net/sourceforge/"

255+ "https://freefr.dl.sourceforge.net/sourceforge/"

256+ "https://osdn.dl.sourceforge.net/sourceforge/"

257+ "https://kent.dl.sourceforge.net/sourceforge/"

132258 ];

133259

134− # BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html .

135− bitlbee = [

136− "https://get.bitlbee.org/"

137− "https://ftp.snt.utwente.nl/pub/software/bitlbee/"

138− "http://bitlbee.intergenia.de/"

260+ # Steam Runtime

261+ steamrt = [

262+ "https://repo.steampowered.com/steamrt/"

263+ "https://public.abbradar.moe/steamrt/"

139264 ];

140265

141− # ImageMagick mirrors, see https://www.imagemagick.org/script/mirror.php

142− imagemagick = [

143− "https://www.imagemagick.org/download/"

144− "https://mirror.checkdomain.de/imagemagick/"

145− "https://ftp.nluug.nl/ImageMagick/"

146− "https://ftp.sunet.se/mirror/imagemagick.org/ftp/"

147− "ftp://ftp.sunet.se/mirror/imagemagick.org/ftp/" # also contains older versions removed from most mirrors

266+ # TCSH shell

267+ tcsh = [

268+ "https://astron.com/pub/tcsh/"

269+ "https://astron.com/pub/tcsh/old/"

270+ "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/"

271+ "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/old/"

272+ "ftp://ftp.astron.com/pub/tcsh/"

273+ "ftp://ftp.astron.com/pub/tcsh/old/"

274+ "ftp://ftp.funet.fi/pub/unix/shells/tcsh/"

275+ "ftp://ftp.funet.fi/pub/unix/shells/tcsh/old/"

148276 ];

149277

150− # CPAN mirrors.

278+ # XFCE

279+ xfce = [

280+ "https://archive.xfce.org/"

281+ "https://mirror.netcologne.de/xfce/"

282+ "https://archive.be.xfce.org/xfce/"

283+ "https://archive.al-us.xfce.org/"

284+ "http://archive.se.xfce.org/xfce/"

285+ "http://mirror.perldude.de/archive.xfce.org/"

286+ "http://archive.be2.xfce.org/"

287+ "http://ftp.udc.es/xfce/"

288+ ];

289+

290+ # X.org

291+ xorg = [

292+ "https://xorg.freedesktop.org/releases/"

293+ "https://ftp.x.org/archive/"

294+ ];

295+

296+ ### Programming languages' package repos

297+

298+ # Perl CPAN

151299 cpan = [

152300 "https://cpan.metacpan.org/"

153301 "https://cpan.perl.org/"

@@ -155,7 +303,35 @@

155303 "https://backpan.perl.org/" # for old releases

156304 ];

157305

158− # CentOS.

306+ # Haskell Hackage

307+ hackage = [

308+ "https://hackage.haskell.org/package/"

309+ ];

310+

311+ # Lua Rocks

312+ luarocks = [

313+ "https://luarocks.org/"

314+ "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/"

315+ "https://luafr.org/moonrocks/"

316+ "http://luarocks.logiceditor.com/rocks/"

317+ ];

318+

319+ # Python PyPI

320+ pypi = [

321+ "https://files.pythonhosted.org/packages/source/"

322+ # pypi.io is a more semantic link, but atm it’s referencing

323+ # files.pythonhosted.org over two redirects

324+ "https://pypi.io/packages/source/"

325+ ];

326+

327+ # Python Test-PyPI

328+ testpypi = [

329+ "https://test.pypi.io/packages/source/"

330+ ];

331+

332+ ### Linux distros

333+

334+ # CentOS

159335 centos = [

160336 # For old releases

161337 "https://vault.centos.org/"

@@ -168,7 +344,7 @@

168344 "http://mirror.centos.org/centos/"

169345 ];

170346

171− # Debian.

347+ # Debian

172348 debian = [

173349 "https://httpredir.debian.org/debian/"

174350 "https://ftp.debian.org/debian/"

@@ -181,17 +357,9 @@

181357 "ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/"

182358 ];

183359

184− # Ubuntu.

185− ubuntu = [

186− "https://nl.archive.ubuntu.com/ubuntu/"

187− "https://old-releases.ubuntu.com/ubuntu/"

188− "https://mirrors.edge.kernel.org/ubuntu/"

189− "http://de.archive.ubuntu.com/ubuntu/"

190− "http://archive.ubuntu.com/ubuntu/"

191− ];

192−

193− # Fedora (please only add full mirrors that carry old Fedora distributions as well).

194− # See: https://mirrors.fedoraproject.org/publiclist (but not all carry old content).

360+ # Fedora

361+ # Please add only full mirrors that carry old Fedora distributions as well

362+ # See: https://mirrors.fedoraproject.org/publiclist (but not all carry old content)

195363 fedora = [

196364 "https://archives.fedoraproject.org/pub/fedora/"

197365 "https://fedora.osuosl.org/"

@@ -203,7 +371,14 @@

203371 "http://mirror.1000mbps.com/fedora/"

204372 ];

205373

206− # openSUSE.

374+ # Gentoo

375+ gentoo = [

376+ "https://ftp.snt.utwente.nl/pub/os/linux/gentoo/"

377+ "https://distfiles.gentoo.org/"

378+ "https://mirrors.kernel.org/gentoo/"

379+ ];

380+

381+ # openSUSE

207382 opensuse = [

208383 "https://opensuse.hro.nl/opensuse/distribution/"

209384 "https://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/"

@@ -213,169 +388,21 @@

213388 "http://ftp.hosteurope.de/mirror/ftp.opensuse.org/discontinued/"

214389 ];

215390

216− gnome = [

217− # This one redirects to some mirror closeby, so it should be all you need.

218− "https://download.gnome.org/"

219−

220− "https://fr2.rpmfind.net/linux/gnome.org/"

221− "https://ftp.acc.umu.se/pub/GNOME/"

222− "https://ftp.belnet.be/mirror/ftp.gnome.org/"

223− "ftp://ftp.cse.buffalo.edu/pub/Gnome/"

224− "ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/"

225− ];

226−

227− xfce = [

228− "https://archive.xfce.org/"

229− "https://mirror.netcologne.de/xfce/"

230− "https://archive.be.xfce.org/xfce/"

231− "https://archive.al-us.xfce.org/"

232− "http://archive.se.xfce.org/xfce/"

233− "http://mirror.perldude.de/archive.xfce.org/"

234− "http://archive.be2.xfce.org/"

235− "http://ftp.udc.es/xfce/"

236− ];

237−

238− # X.org.

239− xorg = [

240− "https://xorg.freedesktop.org/releases/"

241− "https://ftp.x.org/archive/"

242− ];

243−

244− apache = [

245− "https://www-eu.apache.org/dist/"

246− "https://ftp.wayne.edu/apache/"

247− "https://www.apache.org/dist/"

248− "https://archive.apache.org/dist/" # fallback for old releases

249− "https://apache.cs.uu.nl/"

250− "https://apache.cs.utah.edu/"

251− "http://ftp.tudelft.nl/apache/"

252− "ftp://ftp.funet.fi/pub/mirrors/apache.org/"

253− ];

254−

255− postgresql = [

256− "https://ftp.postgresql.org/pub/"

257− ];

258−

259− metalab = [

260− "ftp://ftp.gwdg.de/pub/linux/metalab/"

261− "ftp://ftp.metalab.unc.edu/pub/linux/"

262− ];

263−

264− # Bioconductor mirrors (from https://bioconductor.org/about/mirrors/)

265− # The commented-out ones don't seem to allow direct package downloads;

266− # they serve error messages that result in hash mismatches instead.

267− bioc = [

268− # http://bioc.ism.ac.jp/

269− # http://bioc.openanalytics.eu/

270− # http://bioconductor.fmrp.usp.br/

271− # http://mirror.aarnet.edu.au/pub/bioconductor/

272− # http://watson.nci.nih.gov/bioc_mirror/

273− "https://bioconductor.statistik.tu-dortmund.de/packages/"

274− "https://mirrors.ustc.edu.cn/bioc/"

275− "http://bioconductor.jp/packages/"

276− ];

277−

278− # Hackage mirrors

279− hackage = [

280− "https://hackage.haskell.org/package/"

281− ];

282−

283− # Roy marples mirrors

284− roy = [

285− "https://roy.marples.name/downloads/"

286− "https://cflags.cc/roy/"

287− ];

288−

289− # Sage mirrors (https://www.sagemath.org/mirrors.html)

290− sageupstream = [

291− # Africa (HTTPS)

292− "https://sagemath.mirror.ac.za/spkg/upstream/"

293− "https://mirror.ufs.ac.za/sagemath/spkg/upstream/"

294−

295− # America, North (HTTPS)

296− "https://mirrors.mit.edu/sage/spkg/upstream/"

297− "https://mirrors.xmission.com/sage/spkg/upstream/"

298−

299− # Asia (HTTPS)

300− "https://mirrors.tuna.tsinghua.edu.cn/sagemath/spkg/upstream/"

301− "https://mirrors.ustc.edu.cn/sagemath/spkg/upstream/"

302− "http://ftp.tsukuba.wide.ad.jp/software/sage/spkg/upstream/"

303− "https://ftp.yz.yamagata-u.ac.jp/pub/math/sage/spkg/upstream/"

304− "https://mirror.yandex.ru/mirrors/sage.math.washington.edu/spkg/upstream/"

305−

306− # Australia (HTTPS)

307− "https://mirror.aarnet.edu.au/pub/sage/spkg/upstream/"

308−

309− # Europe (HTTPS)

310− "https://sage.mirror.garr.it/mirrors/sage/spkg/upstream/"

311− "https://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream/"

312−

313− # Africa (non-HTTPS)

314− "ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/spkg/upstream/"

315−

316− # America, North (non-HTTPS)

317− "http://www.cecm.sfu.ca/sage/spkg/upstream/"

318−

319− # America, South (non-HTTPS)

320− "http://sagemath.c3sl.ufpr.br/spkg/upstream/"

321− "http://linorg.usp.br/sage/spkg/upstream"

322−

323− # Asia (non-HTTPS)

324− "http://ftp.kaist.ac.kr/sage/spkg/upstream/"

325− "http://ftp.riken.jp/sagemath/spkg/upstream/"

326−

327− # Europe (non-HTTPS)

328− "http://mirrors.fe.up.pt/pub/sage/spkg/upstream/"

329− "http://ftp.ntua.gr/pub/sagemath/spkg/upstream/"

391+ # Ubuntu

392+ ubuntu = [

393+ "https://nl.archive.ubuntu.com/ubuntu/"

394+ "https://old-releases.ubuntu.com/ubuntu/"

395+ "https://mirrors.edge.kernel.org/ubuntu/"

396+ "http://de.archive.ubuntu.com/ubuntu/"

397+ "http://archive.ubuntu.com/ubuntu/"

330398 ];

331399

332− # MySQL mirrors

333− mysql = [

334− "https://cdn.mysql.com/Downloads/"

335− ];

400+ # ... and other OSes in general

336401

337− # OpenBSD mirrors

402+ # OpenBSD

338403 openbsd = [

339404 "https://ftp.openbsd.org/pub/OpenBSD/"

340405 "ftp://ftp.nluug.nl/pub/OpenBSD/"

341406 "ftp://ftp-stud.fht-esslingen.de/pub/OpenBSD/"

342407 ];

343−

344− # Steam Runtime mirrors

345− steamrt = [

346− "https://repo.steampowered.com/steamrt/"

347− "https://public.abbradar.moe/steamrt/"

348− ];

349−

350− # Python PyPI mirrors

351− pypi = [

352− "https://files.pythonhosted.org/packages/source/"

353− # pypi.io is a more semantic link, but atm it’s referencing

354− # files.pythonhosted.org over two redirects

355− "https://pypi.io/packages/source/"

356− ];

357−

358− # Python Test-PyPI mirror

359− testpypi = [

360− "https://test.pypi.io/packages/source/"

361− ];

362−

363− # Mozilla projects.

364− mozilla = [

365− "https://download.cdn.mozilla.net/pub/mozilla.org/"

366− "https://archive.mozilla.org/pub/"

367− ];

368−

369− # Maven Central

370− maven = [

371− "https://repo1.maven.org/maven2/"

372− ];

373−

374− # Alsa Project

375− alsa = [

376− "https://www.alsa-project.org/files/pub/"

377− "ftp://ftp.alsa-project.org/pub/"

378− "http://alsa.cybermirror.org/"

379− "http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/"

380− ];

381408}

pkgs/build-support/ocaml/dune.nix+1−1

@@ -2,7 +2,7 @@

33{ pname, version, nativeBuildInputs ? [], enableParallelBuilding ? true, ... }@args:

5−let Dune = if args.useDune2 or false then dune_2 else dune_1; in

5+let Dune = if args.useDune2 or true then dune_2 else dune_1; in

77if (args ? minimumOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimumOCamlVersion) ||

88 (args ? minimalOCamlVersion && ! lib.versionAtLeast ocaml.version args.minimalOCamlVersion)

pkgs/development/compilers/llvm/14/default.nix+2−2

@@ -19,7 +19,7 @@

1919

2020let

2121 release_version = "14.0.0";

22− candidate = "rc2"; # empty or "rcN"

22+ candidate = "rc4"; # empty or "rcN"

2323 dash-candidate = lib.optionalString (candidate != "") "-${candidate}";

2424 rev = ""; # When using a Git commit

2525 rev-version = ""; # When using a Git commit

@@ -30,7 +30,7 @@ let

3030 owner = "llvm";

3131 repo = "llvm-project";

3232 rev = if rev != "" then rev else "llvmorg-${version}";

33− sha256 = "sha256-5wJEaWvwJohtjqlIsBkqQ5rE6rcWw07MaQnN1RxPb5w=";

33+ sha256 = "0xm3hscg6xv48rjdi7sg9ky960af1qyg5k3jyavnaqimlaj9wxgp";

3434 };

3535

3636 llvm_meta = {

pkgs/development/compilers/llvm/14/llvm/default.nix+3

@@ -209,6 +209,9 @@ in stdenv.mkDerivation (rec {

209209

210210 checkTarget = "check-all";

211211

212+ # For the update script:

213+ passthru.monorepoSrc = monorepoSrc;

214+

212215 requiredSystemFeatures = [ "big-parallel" ];

213216 meta = llvm_meta // {

214217 homepage = "https://llvm.org/";

pkgs/development/compilers/llvm/update.sh+6−2

@@ -20,7 +20,11 @@ sed -Ei \

2020

2121readonly ATTRSET="llvmPackages_$VERSION_MAJOR"

2222

23−if [ "$VERSION_MAJOR" -ge "13" ]; then

23+if [ "$VERSION_MAJOR" -ge "14" ]; then

24+ readonly SOURCES=(

25+ "llvm.monorepoSrc"

26+ )

27+elif [ "$VERSION_MAJOR" -eq "13" ]; then

2428 readonly SOURCES=(

2529 "llvm.src"

2630 )

@@ -43,7 +47,7 @@ fi

4347for SOURCE in "${SOURCES[@]}"; do

4448 echo "Updating the hash of $SOURCE:"

4549 declare ATTR="$ATTRSET.$SOURCE"

46− declare OLD_HASH="$(nix eval -f . $ATTR.outputHash)"

50+ declare OLD_HASH="$(nix --extra-experimental-features nix-command eval -f . $ATTR.outputHash)"

4751 declare NEW_HASH="\"$(nix-prefetch-url -A $ATTR)\""

4852 find "$DIR" -type f -exec sed -i "s/$OLD_HASH/$NEW_HASH/" {} +

4953done

pkgs/development/compilers/ocaml/4.14.nixnew file+9

@@ -0,0 +1,9 @@

1+import ./generic.nix {

2+ major_version = "4";

3+ minor_version = "14";

4+ patch_version = "0-beta1";

5+ src = fetchTarball {

6+ url = "https://caml.inria.fr/pub/distrib/ocaml-4.14/ocaml-4.14.0~beta1.tar.xz";

7+ sha256 = "0jiz20hb58jbbk8j38agx11ra4hg0v3prmzc5a9j70lm09mnzfcd";

8+ };

9+}

pkgs/development/libraries/vte/default.nix+6

@@ -21,6 +21,7 @@

2121, zlib

2222, icu

2323, systemd

24+, systemdSupport ? stdenv.hostPlatform.isLinux

2425}:

2526

2627stdenv.mkDerivation rec {

@@ -63,6 +64,7 @@ stdenv.mkDerivation rec {

6364 pcre2

6465 zlib

6566 icu

67+ ] ++ lib.optionals systemdSupport [

6668 systemd

6769 ];

6870

@@ -73,6 +75,10 @@ stdenv.mkDerivation rec {

7375 pango

7476 ];

7577

78+ mesonFlags = lib.optionals (!systemdSupport) [

79+ "-D_systemd=false"

80+ ];

81+

7682 postPatch = ''

7783 patchShebangs perf/*

7884 patchShebangs src/box_drawing_generate.sh

pkgs/development/ocaml-modules/facile/default.nix+2

@@ -4,6 +4,8 @@ buildDunePackage rec {

44 pname = "facile";

55 version = "1.1.4";

7+ useDune2 = false;

79 src = fetchurl {

810 url = "https://github.com/Emmanuel-PLF/facile/releases/download/${version}/facile-${version}.tbz";

911 sha256 = "0jqrwmn6fr2vj2rrbllwxq4cmxykv7zh0y4vnngx29f5084a04jp";

pkgs/development/ocaml-modules/genspio/default.nix+3−1

@@ -6,6 +6,8 @@ buildDunePackage rec {

66 pname = "genspio";

77 version = "0.0.2";

9+ useDune2 = false;

10+

911 src = fetchFromGitHub {

1012 owner = "hammerlab";

1113 repo = pname;

@@ -13,7 +15,7 @@ buildDunePackage rec {

1315 sha256 = "0cp6p1f713sfv4p2r03bzvjvakzn4ili7hf3a952b3w1k39hv37x";

1416 };

1517

16− minimumOCamlVersion = "4.03";

18+ minimalOCamlVersion = "4.03";

1719

1820 propagatedBuildInputs = [ nonstd sosa ];

1921

pkgs/development/ocaml-modules/janestreet/janePackage.nix+3−1

@@ -5,7 +5,9 @@

55buildDunePackage (args // {

66 inherit version buildInputs;

8− minimumOCamlVersion = "4.04";

8+ useDune2 = false;

10+ minimalOCamlVersion = "4.04";

911

1012 src = fetchFromGitHub {

1113 owner = "janestreet";

pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix+2

@@ -5,6 +5,8 @@

55buildDunePackage (args // {

66 inherit version;

8+ useDune2 = false;

810 minimalOCamlVersion = "4.07";

911

1012 src = fetchFromGitHub {

pkgs/development/ocaml-modules/lwt/camlp4.nix+3−1

@@ -11,7 +11,9 @@ buildDunePackage rec {

1111 sha256 = "1lv8z6ljfy47yvxmwf5jrvc5d3dc90r1n291x53j161sf22ddrk9";

1212 };

1313

14− minimumOCamlVersion = "4.02";

14+ useDune2 = false;

15+

16+ minimalOCamlVersion = "4.02";

1517

1618 propagatedBuildInputs = [ camlp4 ];

1719

pkgs/development/ocaml-modules/nonstd/default.nix+3−1

@@ -4,7 +4,9 @@ buildDunePackage rec {

44 pname = "nonstd";

55 version = "0.0.3";

7− minimumOCamlVersion = "4.02";

7+ useDune2 = false;

9+ minimalOCamlVersion = "4.02";

810

911 src = fetchzip {

1012 url = "https://bitbucket.org/smondet/${pname}/get/${pname}.${version}.tar.gz";

pkgs/development/ocaml-modules/ocamlfuse/default.nix+4−4

@@ -1,14 +1,14 @@

11{ lib, buildDunePackage, fetchFromGitHub, camlidl, fuse, dune-configurator }:

3−buildDunePackage {

3+buildDunePackage rec {

44 pname = "ocamlfuse";

5− version = "2.7.1_cvs6_e35e76b";

5+ version = "2.7.1_cvs7";

77 src = fetchFromGitHub {

88 owner = "astrada";

99 repo = "ocamlfuse";

10− rev = "e35e76bee3b06806256b5bfca108b7697267cd5c";

11− sha256 = "1v9g0wh7rnjkrjrnw50145g6ry38plyjs8fq8w0nlzwizhf3qhff";

10+ rev = "v${version}";

11+ sha256 = "6nmPXZx38hBGlg+gV9nnlRpPfeSAqDj4zBPcjUNvTRo=";

1212 };

1313

1414 # This currently fails with dune

pkgs/development/ocaml-modules/owee/default.nix+8−9

@@ -1,20 +1,19 @@

1−{ lib, buildDunePackage, fetchFromGitHub }:

1+{ lib, buildDunePackage, fetchurl }:

33buildDunePackage rec {

4− minimumOCamlVersion = "4.06";

4+ minimalOCamlVersion = "4.06";

5+ useDune2 = true;

56 pname = "owee";

6− version = "0.3";

7+ version = "0.4";

8− src = fetchFromGitHub {

9− owner = "let-def";

10− repo = "owee";

11− rev = "v${version}";

12− sha256 = "0jp8ca57488d7sj2nqy4yxcdpda6sxx51yyi8k6888hbinhyqp0j";

9+ src = fetchurl {

10+ url = "https://github.com/let-def/owee/releases/download/v${version}/owee-${version}.tbz";

11+ sha256 = "sha256:055bi0yfdki1pqagbhrwmfvigyawjgsmqw04zhpp6hds8513qzvb";

1312 };

1413

1514 meta = {

1615 description = "An experimental OCaml library to work with DWARF format";

17− inherit (src.meta) homepage;

16+ homepage = "https://github.com/let-def/owee/";

1817 license = lib.licenses.mit;

1918 maintainers = [ lib.maintainers.vbgl ];

2019 };

pkgs/development/ocaml-modules/spacetime_lib/default.nix+4−1

@@ -1,4 +1,7 @@

1−{ lib, fetchFromGitHub, buildDunePackage, owee }:

1+{ lib, fetchFromGitHub, buildDunePackage, ocaml, owee }:

3+lib.throwIfNot (lib.versionAtLeast "4.12" ocaml.version)

4+ "spacetime_lib is not available for OCaml ${ocaml.version}"

36buildDunePackage rec {

47 pname = "spacetime_lib";

pkgs/development/php-packages/box/default.nix+2

@@ -16,10 +16,12 @@ mkDerivation {

1616 nativeBuildInputs = [ makeWrapper ];

1717

1818 installPhase = ''

19+ runHook preInstall

1920 mkdir -p $out/bin

2021 install -D $src $out/libexec/box/box.phar

2122 makeWrapper ${php}/bin/php $out/bin/box \

2223 --add-flags "-d phar.readonly=0 $out/libexec/box/box.phar"

24+ runHook postInstall

2325 '';

2426

2527 meta = with lib; {

pkgs/development/php-packages/deployer/default.nix+2

@@ -14,6 +14,7 @@ mkDerivation rec {

1414 nativeBuildInputs = [ makeWrapper installShellFiles ];

1515

1616 installPhase = ''

17+ runHook preInstall

1718 mkdir -p $out/bin

1819 install -D $src $out/libexec/deployer/deployer.phar

1920 makeWrapper ${php}/bin/php $out/bin/dep --add-flags "$out/libexec/deployer/deployer.phar"

@@ -22,6 +23,7 @@ mkDerivation rec {

2223 installShellCompletion --cmd dep \

2324 --bash <($out/bin/dep autocomplete --install) \

2425 --zsh <($out/bin/dep autocomplete --install)

26+ runHook postInstall

2527 '';

2628

2729 meta = with lib; {

pkgs/development/php-packages/phing/default.nix+2

@@ -16,10 +16,12 @@ mkDerivation {

1616 nativeBuildInputs = [ makeWrapper ];

1717

1818 installPhase = ''

19+ runHook preInstall

1920 mkdir -p $out/bin

2021 install -D $src $out/libexec/phing/phing.phar

2122 makeWrapper ${php}/bin/php $out/bin/phing \

2223 --add-flags "$out/libexec/phing/phing.phar"

24+ runHook postInstall

2325 '';

2426

2527 meta = with lib; {

pkgs/development/php-packages/phive/default.nixnew file+31

@@ -0,0 +1,31 @@

1+{ mkDerivation, fetchurl, makeWrapper, lib, php }:

3+mkDerivation rec {

4+ pname = "phive";

5+ version = "0.15.0";

7+ src = fetchurl {

8+ url = "https://github.com/phar-io/phive/releases/download/${version}/phive-${version}.phar";

9+ sha256 = "sha256-crMr8d5nsVt7+zQ5xPeph/JXmTEn6jJFVtp3mOgylB4=";

10+ };

11+

12+ dontUnpack = true;

13+

14+ nativeBuildInputs = [ makeWrapper ];

15+

16+ installPhase = ''

17+ runHook preInstall

18+ mkdir -p $out/bin

19+ install -D $src $out/libexec/phive/phive.phar

20+ makeWrapper ${php}/bin/php $out/bin/phive \

21+ --add-flags "$out/libexec/phive/phive.phar"

22+ runHook postInstall

23+ '';

24+

25+ meta = with lib; {

26+ description = "The Phar Installation and Verification Environment (PHIVE)";

27+ homepage = "https://github.com/phar-io/phive";

28+ license = licenses.bsd3;

29+ maintainers = with maintainers; teams.php.members;

30+ };

31+}

pkgs/development/php-packages/php-cs-fixer/default.nix+2

@@ -16,10 +16,12 @@ mkDerivation {

1616 nativeBuildInputs = [ makeWrapper ];

1717

1818 installPhase = ''

19+ runHook preInstall

1920 mkdir -p $out/bin

2021 install -D $src $out/libexec/php-cs-fixer/php-cs-fixer.phar

2122 makeWrapper ${php}/bin/php $out/bin/php-cs-fixer \

2223 --add-flags "$out/libexec/php-cs-fixer/php-cs-fixer.phar"

24+ runHook postInstall

2325 '';

2426

2527 meta = with lib; {

pkgs/development/php-packages/php-parallel-lint/default.nix+4

@@ -20,15 +20,19 @@ mkDerivation {

2020 ];

2121

2222 buildPhase = ''

23+ runHook preBuild

2324 composer dump-autoload

2425 box build

26+ runHook postBuild

2527 '';

2628

2729 installPhase = ''

30+ runHook preInstall

2831 mkdir -p $out/bin

2932 install -D parallel-lint.phar $out/libexec/php-parallel-lint/php-parallel-lint.phar

3033 makeWrapper ${php}/bin/php $out/bin/php-parallel-lint \

3134 --add-flags "$out/libexec/php-parallel-lint/php-parallel-lint.phar"

35+ runHook postInstall

3236 '';

3337

3438 meta = with lib; {

pkgs/development/php-packages/phpcbf/default.nix+2

@@ -16,10 +16,12 @@ mkDerivation {

1616 nativeBuildInputs = [ makeWrapper ];

1717

1818 installPhase = ''

19+ runHook preInstall

1920 mkdir -p $out/bin

2021 install -D $src $out/libexec/phpcbf/phpcbf.phar

2122 makeWrapper ${php}/bin/php $out/bin/phpcbf \

2223 --add-flags "$out/libexec/phpcbf/phpcbf.phar"

24+ runHook postInstall

2325 '';

2426

2527 meta = with lib; {

pkgs/development/php-packages/phpcs/default.nix+2

@@ -16,10 +16,12 @@ mkDerivation {

1616 nativeBuildInputs = [ makeWrapper ];

1717

1818 installPhase = ''

19+ runHook preInstall

1920 mkdir -p $out/bin

2021 install -D $src $out/libexec/phpcs/phpcs.phar

2122 makeWrapper ${php}/bin/php $out/bin/phpcs \

2223 --add-flags "$out/libexec/phpcs/phpcs.phar"

24+ runHook postInstall

2325 '';

2426

2527 meta = with lib; {

pkgs/development/php-packages/phpmd/default.nix+2

@@ -16,10 +16,12 @@ mkDerivation {

1616 nativeBuildInputs = [ makeWrapper ];

1717

1818 installPhase = ''

19+ runHook preInstall

1920 mkdir -p $out/bin

2021 install -D $src $out/libexec/phpmd/phpmd.phar

2122 makeWrapper ${php}/bin/php $out/bin/phpmd \

2223 --add-flags "$out/libexec/phpmd/phpmd.phar"

24+ runHook postInstall

2325 '';

2426

2527 meta = with lib; {

pkgs/development/php-packages/phpstan/default.nix+2

@@ -16,10 +16,12 @@ mkDerivation {

1616 nativeBuildInputs = [ makeWrapper ];

1717

1818 installPhase = ''

19+ runHook preInstall

1920 mkdir -p $out/bin

2021 install -D $src $out/libexec/phpstan/phpstan.phar

2122 makeWrapper ${php}/bin/php $out/bin/phpstan \

2223 --add-flags "$out/libexec/phpstan/phpstan.phar"

24+ runHook postInstall

2325 '';

2426

2527 meta = with lib; {

pkgs/development/php-packages/psalm/default.nix+2

@@ -16,10 +16,12 @@ mkDerivation {

1616 nativeBuildInputs = [ makeWrapper ];

1717

1818 installPhase = ''

19+ runHook preInstall

1920 mkdir -p $out/bin

2021 install -D $src $out/libexec/psalm/psalm.phar

2122 makeWrapper ${php}/bin/php $out/bin/psalm \

2223 --add-flags "$out/libexec/psalm/psalm.phar"

24+ runHook postInstall

2325 '';

2426

2527 meta = with lib; {

pkgs/development/php-packages/psysh/default.nix+2

@@ -16,10 +16,12 @@ mkDerivation {

1616 nativeBuildInputs = [ makeWrapper ];

1717

1818 installPhase = ''

19+ runHook preInstall

1920 mkdir -p $out/bin

2021 tar -xzf $src -C $out/bin

2122 chmod +x $out/bin/psysh

2223 wrapProgram $out/bin/psysh --prefix PATH : "${lib.makeBinPath [ php ]}"

24+ runHook postInstall

2325 '';

2426

2527 meta = with lib; {

pkgs/development/python-modules/aio-geojson-client/default.nix+2−2

@@ -13,7 +13,7 @@

1313

1414buildPythonPackage rec {

1515 pname = "aio-geojson-client";

16− version = "0.16";

16+ version = "0.17";

1717 format = "setuptools";

1818

1919 disabled = pythonOlder "3.7";

@@ -22,7 +22,7 @@ buildPythonPackage rec {

2222 owner = "exxamalte";

2323 repo = "python-aio-geojson-client";

2424 rev = "v${version}";

25− hash = "sha256-u3SwrSxeBJrBTHfqKY/mAb2p1jqW2AvRsHomKsI81gM=";

25+ hash = "sha256-5GiQgtbvYeleovFbXO2vlr2XPsDIWZiElM64O+urMcY=";

2626 };

2727

2828 propagatedBuildInputs = [

pkgs/development/python-modules/pudb/default.nix+3−4

@@ -1,7 +1,6 @@

11{ lib

22, buildPythonPackage

33, dataclasses

4−, isPy3k

54, fetchPypi

65, jedi

76, pygments

@@ -14,14 +13,14 @@

1413

1514buildPythonPackage rec {

1615 pname = "pudb";

17− version = "2022.1";

16+ version = "2022.1.1";

1817 format = "setuptools";

1918

20− disabled = !isPy3k;

19+ disabled = pythonOlder "3.6";

2120

2221 src = fetchPypi {

2322 inherit pname version;

24− sha256 = "e827a4b489dcad561189535db6677becbf32164b2b44df00786eb2d5e00c587e";

23+ hash = "sha256-2zvdZkI8nSkHTBwsSfyyJL0Nbwgxn+0bTn6taDkUCD8=";

2524 };

2625

2726 propagatedBuildInputs = [

pkgs/development/python-modules/types-requests/default.nix+2−2

@@ -6,12 +6,12 @@

77buildPythonPackage rec {

88 pname = "types-requests";

9− version = "2.27.11";

9+ version = "2.27.12";

1010 format = "setuptools";

1111

1212 src = fetchPypi {

1313 inherit pname version;

14− sha256 = "sha256-an7SSyF4CvSlteJMMQss2IX7YS31/ZVYTQPYfl8qGVo=";

14+ sha256 = "sha256-/ROC+i4o6shI+u2wMyhAIE8G8MtRcAjjx7goLKU+VtI=";

1515 };

1616

1717 propagatedBuildInputs = [

pkgs/development/python-modules/types-urllib3/default.nix+2−2

@@ -5,12 +5,12 @@

66buildPythonPackage rec {

77 pname = "types-urllib3";

8− version = "1.26.10";

8+ version = "1.26.11";

99 format = "setuptools";

1010

1111 src = fetchPypi {

1212 inherit pname version;

13− hash = "sha256-omiY9TDmw/Q/JbkH8riESGho/9Vqn6qUy/mz624WXWo=";

13+ hash = "sha256-JNZORBFohR6wXx0CLeGK4xVY9WScjxEX44TC6F4xMVs=";

1414 };

1515

1616 # Module doesn't have tests

pkgs/development/python-modules/unidiff/default.nix+2−2

@@ -2,11 +2,11 @@

33buildPythonPackage rec {

44 pname = "unidiff";

5− version = "0.7.0";

5+ version = "0.7.3";

77 src = fetchPypi {

88 inherit pname version;

9− sha256 = "91bb13b4969514a400679d9ae5e29a6ffad85346087677f8b5e2e036af817447";

9+ sha256 = "sha256-1fLlOpoA2zIkqMNjSbU4Dg4i0a7GxpSxT7lIPuk8YgU=";

1010 };

1111

1212 pythonImportsCheck = [ "unidiff" ];

pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix+2

@@ -6,6 +6,8 @@ buildDunePackage rec {

66 version = "3.2.1";

77 pname = "js_of_ocaml-camlp4";

9+ useDune2 = false;

10+

911 src = fetchFromGitHub {

1012 owner = "ocsigen";

1113 repo = "js_of_ocaml";

pkgs/development/tools/profiling/systemtap/default.nix+2−2

@@ -16,8 +16,8 @@ let

1616 pname = "systemtap";

1717 inherit version;

1818 src = fetchgit { inherit url rev sha256; };

19− nativeBuildInputs = [ pkg-config cpio ];

20− buildInputs = [ elfutils gettext python3 python3.pkgs.setuptools ];

19+ nativeBuildInputs = [ pkg-config cpio python3 python3.pkgs.setuptools ];

20+ buildInputs = [ elfutils gettext ];

2121 enableParallelBuilding = true;

2222 };

2323

pkgs/games/freedroidrpg/default.nix+10−1

@@ -1,4 +1,4 @@

1−{ fetchurl, lib, stdenv, pkg-config, gettext, python3, SDL, SDL_image, SDL_gfx, SDL_mixer, libogg, libvorbis, lua5_3, libjpeg, libpng, zlib, libiconv }:

1+{ fetchurl, fetchpatch, lib, stdenv, pkg-config, gettext, python3, SDL, SDL_image, SDL_gfx, SDL_mixer, libogg, libvorbis, lua5_3, libjpeg, libpng, zlib, libiconv }:

33let

44 version = "0.16.1";

@@ -11,6 +11,15 @@ in stdenv.mkDerivation {

1111 sha256 = "0n4kn38ncmcy3lrxmq8fjry6c1z50z4q1zcqfig0j4jb0dsz2va2";

1212 };

1313

14+ patches = [

15+ # Pull upstream fix for -fno-common tolchains.

16+ (fetchpatch {

17+ name = "fno-common.patch";

18+ url = "https://gitlab.com/freedroid/freedroid-src/-/commit/e610d427374226b79da5258d979936459f30c761.patch";

19+ sha256 = "1s7sw4dkc7b6i72j6x47driq6v0k3wss48l9ivd4fw40n3iaxjb1";

20+ })

21+ ];

22+

1423 nativeBuildInputs = [ pkg-config gettext python3 ];

1524

1625 buildInputs = [

pkgs/os-specific/linux/akvcam/default.nix+2−1

@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {

1212 };

1313 sourceRoot = "source/src";

1414

15− makeFlags = [

15+ nativeBuildInputs = kernel.moduleBuildDependencies;

16+ makeFlags = kernel.makeFlags ++ [

1617 "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

1718 ];

1819

pkgs/os-specific/linux/apfs/default.nix+1−1

@@ -18,7 +18,7 @@ stdenv.mkDerivation {

1818 hardeningDisable = [ "pic" ];

1919 nativeBuildInputs = kernel.moduleBuildDependencies;

2020

21− makeFlags = [

21+ makeFlags = kernel.makeFlags ++ [

2222 "KERNELRELEASE=${kernel.modDirVersion}"

2323 "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

2424 "INSTALL_MOD_PATH=$(out)"

pkgs/os-specific/linux/batman-adv/default.nix+3−1

@@ -12,11 +12,13 @@ stdenv.mkDerivation rec {

1212 };

1313

1414 nativeBuildInputs = kernel.moduleBuildDependencies;

15+ makeFlags = kernel.makeFlags ++ [

16+ "KERNELPATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

17+ ];

1518

1619 hardeningDisable = [ "pic" ];

1720

1821 preBuild = ''

19− makeFlags="KERNELPATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

2022 sed -i -e "s,INSTALL_MOD_DIR=,INSTALL_MOD_PATH=$out INSTALL_MOD_DIR=," \

2123 -e /depmod/d Makefile

2224 '';

pkgs/os-specific/linux/can-isotp/default.nix+6−9

@@ -13,16 +13,13 @@ stdenv.mkDerivation {

1313 sha256 = "1laax93czalclg7cy9iq1r7hfh9jigh7igj06y9lski75ap2vhfq";

1414 };

1515

16− KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";

17− INSTALL_MOD_PATH = "\${out}";

16+ makeFlags = kernel.makeFlags ++ [

17+ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

18+ "INSTALL_MOD_PATH=${placeholder "out"}"

19+ ];

1820

19− buildPhase = ''

20− make modules

21− '';

22−

23− installPhase = ''

24− make modules_install

25− '';

21+ buildFlags = [ "modules" ];

22+ installTargets = [ "modules_install" ];

2623

2724 nativeBuildInputs = kernel.moduleBuildDependencies;

2825

pkgs/os-specific/linux/cryptodev/default.nix+1

@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {

1111 sha256 = "sha256-vJQ10rG5FGbeEOqCUmH/pZ0P77kAW/MtUarywbtIyHw=";

1212 };

1313

14+ nativeBuildInputs = kernel.moduleBuildDependencies;

1415 hardeningDisable = [ "pic" ];

1516

1617 KERNEL_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";

pkgs/os-specific/linux/digimend/default.nix+2−3

@@ -13,8 +13,6 @@ stdenv.mkDerivation rec {

1313 sha256 = "1l54j85540386a8aypqka7p5hy1b63cwmpsscv9rmmf10f78v8mm";

1414 };

1515

16− INSTALL_MOD_PATH = "\${out}";

17−

1816 postPatch = ''

1917 sed 's/udevadm /true /' -i Makefile

2018 sed 's/depmod /true /' -i Makefile

@@ -38,10 +36,11 @@ stdenv.mkDerivation rec {

3836 rm -r $out/lib/udev

3937 '';

4038

41− makeFlags = [

39+ makeFlags = kernel.makeFlags ++ [

4240 "KVERSION=${kernel.modDirVersion}"

4341 "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

4442 "DESTDIR=${placeholder "out"}"

43+ "INSTALL_MOD_PATH=${placeholder "out"}"

4544 ];

4645

4746 meta = with lib; {

pkgs/os-specific/linux/dpdk-kmods/default.nix+4−2

@@ -11,6 +11,9 @@ stdenv.mkDerivation rec {

1111

1212 hardeningDisable = [ "pic" ];

1313

14+ makeFlags = kernel.makeFlags ++ [

15+ "INSTALL_MOD_PATH=${placeholder "out"}"

16+ ];

1417 KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";

1518

1619 nativeBuildInputs = kernel.moduleBuildDependencies;

@@ -18,10 +21,9 @@ stdenv.mkDerivation rec {

1821 preBuild = "cd linux/igb_uio";

1922

2023 installPhase = ''

21− make -C ${KSRC} M=$(pwd) modules_install

24+ make -C ${KSRC} M=$(pwd) modules_install $makeFlags

2225 '';

2326

24− INSTALL_MOD_PATH = placeholder "out";

2527 enableParallelBuilding = true;

2628

2729 meta = with lib; {

pkgs/os-specific/linux/ena/default.nix+2−1

@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {

1414 hardeningDisable = [ "pic" ];

1515

1616 nativeBuildInputs = kernel.moduleBuildDependencies;

17+ makeFlags = kernel.makeFlags;

1718

1819 # linux 3.12

1920 NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";

@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {

2728

2829 installPhase = ''

2930 runHook preInstall

30− strip -S ena.ko

31+ $STRIP -S ena.ko

3132 dest=$out/lib/modules/${kernel.modDirVersion}/misc

3233 mkdir -p $dest

3334 cp ena.ko $dest/

pkgs/os-specific/linux/evdi/default.nix+1−1

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {

1717

1818 buildInputs = [ kernel libdrm ];

1919

20− makeFlags = [

20+ makeFlags = kernel.makeFlags ++ [

2121 "KVER=${kernel.modDirVersion}"

2222 "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

2323 ];

pkgs/os-specific/linux/fwts/module.nix+1−1

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

1818

1919 hardeningDisable = [ "pic" ];

2020

21− makeFlags = [

21+ makeFlags = kernel.makeFlags ++ [

2222 "INSTALL_MOD_PATH=${placeholder "out"}"

2323 ];

2424

pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix+1−1

@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {

1919

2020 nativeBuildInputs = kernel.moduleBuildDependencies;

2121

22− makeFlags = [

22+ makeFlags = kernel.makeFlags ++ [

2323 "KERNEL_SOURCE_DIR=${kernel.dev}/${kerneldir}/build"

2424 "INSTALL_MOD_PATH=$(out)"

2525 ];

pkgs/os-specific/linux/hid-nintendo/default.nix+1−1

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {

1717

1818 nativeBuildInputs = kernel.moduleBuildDependencies;

1919

20− makeFlags = [

20+ makeFlags = kernel.makeFlags ++ [

2121 "-C"

2222 "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

2323 "M=$(sourceRoot)"

pkgs/os-specific/linux/jool/default.nix+5−6

@@ -16,13 +16,12 @@ stdenv.mkDerivation {

1616 sed -e 's@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@' -i src/mod/*/Makefile

1717 '';

1818

19− buildPhase = ''

20− make -C src/mod

21− '';

19+ makeFlags = kernel.makeFlags ++ [

20+ "-C src/mod"

21+ "INSTALL_MOD_PATH=${placeholder "out"}"

22+ ];

2223

23− installPhase = ''

24− make -C src/mod modules_install INSTALL_MOD_PATH=$out

25− '';

24+ installTargets = "modules_install";

2625

2726 meta = with lib; {

2827 homepage = "https://www.jool.mx/";

pkgs/os-specific/linux/kernel/manual-config.nix+1−1

@@ -56,7 +56,7 @@ let

5656 hasAttr getAttr optional optionals optionalString optionalAttrs maintainers platforms;

5757

5858 # Dependencies that are required to build kernel modules

59− moduleBuildDependencies = optional (lib.versionAtLeast version "4.14") libelf;

59+ moduleBuildDependencies = [ perl ] ++ optional (lib.versionAtLeast version "4.14") libelf;

6060

6161

6262 installkernel = writeTextFile { name = "installkernel"; executable=true; text = ''

pkgs/os-specific/linux/lttng-modules/default.nix+5−5

@@ -9,16 +9,16 @@ stdenv.mkDerivation rec {

99 sha256 = "0hzksx2fw008jdsgfzpws9g7imy6ryw09ai5y0knvrmvr68nvj57";

1010 };

1111

12− buildInputs = kernel.moduleBuildDependencies;

12+ nativeBuildInputs = kernel.moduleBuildDependencies;

1313

1414 hardeningDisable = [ "pic" ];

1515

1616 NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";

1717

18− preConfigure = ''

19− export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

20− export INSTALL_MOD_PATH="$out"

21− '';

18+ makeFlags = kernel.makeFlags ++ [

19+ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

20+ "INSTALL_MOD_PATH=${placeholder "out"}"

21+ ];

2222

2323 installTargets = [ "modules_install" ];

2424

pkgs/os-specific/linux/mba6x_bl/default.nix+1−1

@@ -16,7 +16,7 @@ stdenv.mkDerivation {

1616

1717 nativeBuildInputs = kernel.moduleBuildDependencies;

1818

19− makeFlags = [

19+ makeFlags = kernel.makeFlags ++ [

2020 "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

2121 "INSTALL_MOD_PATH=$(out)"

2222 ];

pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix+5−2

@@ -11,14 +11,17 @@ stdenv.mkDerivation rec {

1111 sha256 = "sha256-o6yGiR+Y5SnX1johdi7fQWP5ts7HdDMqeju75UOhgik=";

1212 };

1313

14+ nativeBuildInputs = kernel.moduleBuildDependencies;

15+ makeFlags = kernel.makeFlags;

16+

1417 buildPhase = ''

1518 make -C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \

16− -j$NIX_BUILD_CORES M=$(pwd) modules

19+ -j$NIX_BUILD_CORES M=$(pwd) modules $makeFlags

1720 '';

1821

1922 installPhase = ''

2023 make -C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \

21− INSTALL_MOD_PATH=$out M=$(pwd) modules_install

24+ INSTALL_MOD_PATH=$out M=$(pwd) modules_install $makeFlags

2225 '';

2326

2427 meta = with lib; {

pkgs/os-specific/linux/netatop/default.nix+3

@@ -12,6 +12,7 @@ stdenv.mkDerivation {

1212 sha256 = "0qjw8glfdmngfvbn1w63q128vxdz2jlabw13y140ga9i5ibl6vvk";

1313 };

1414

15+ nativeBuildInputs = kernel.moduleBuildDependencies;

1516 buildInputs = [ kmod zlib ];

1617

1718 hardeningDisable = [ "pic" ];

@@ -36,6 +37,8 @@ stdenv.mkDerivation {

3637 kmod=${kmod} substituteAllInPlace netatop.service

3738 '';

3839

40+ makeFlags = kernel.makeFlags;

41+

3942 preInstall = ''

4043 mkdir -p $out/lib/systemd/system $out/bin $out/sbin $out/share/man/man{4,8}

4144 mkdir -p $out/lib/modules/${kernel.modDirVersion}/extra

pkgs/os-specific/linux/openrazer/driver.nix+1−1

@@ -15,7 +15,7 @@ stdenv.mkDerivation (common // {

1515

1616 nativeBuildInputs = kernel.moduleBuildDependencies;

1717

18− buildFlags = [

18+ makeFlags = kernel.makeFlags ++ [

1919 "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

2020 ];

2121

pkgs/os-specific/linux/r8168/default.nix+5−3

@@ -27,11 +27,13 @@ in stdenv.mkDerivation rec {

2727 # avoid using the Makefile directly -- it doesn't understand

2828 # any kernel but the current.

2929 # based on the ArchLinux pkgbuild: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/r8168

30+ makeFlags = kernel.makeFlags ++ [

31+ "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

32+ "M=$(PWD)/src"

33+ "modules"

34+ ];

3035 preBuild = ''

31− makeFlagsArray+=("-C${kernel.dev}/lib/modules/${kernel.modDirVersion}/build")

32− makeFlagsArray+=("M=$PWD/src")

3336 makeFlagsArray+=("EXTRA_CFLAGS=-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN -DCONFIG_ASPM -DENABLE_S5WOL -DENABLE_EEE")

34− makeFlagsArray+=("modules")

3537 '';

3638

3739 enableParallelBuilding = true;

pkgs/os-specific/linux/rtl8189es/default.nix+5−9

@@ -2,17 +2,16 @@

33stdenv.mkDerivation rec {

44 name = "rtl8189es-${kernel.version}-${version}";

5− version = "2020-10-03";

5+ version = "2021-10-01";

77 src = fetchFromGitHub {

88 owner = "jwrdegoede";

99 repo = "rtl8189ES_linux";

10− rev = "03ac413135a355b55b693154c44b70f86a39732e";

11− sha256 = "0wiikviwyvy6h55rgdvy7csi1zqniqg26p8x44rd6mhbw0g00h56";

10+ rev = "be378f47055da1bae42ff6ec1d62f1a5052ef097";

11+ sha256 = "sha256-+19q1Xux2BjquavY+s0UDzTubEt6BEUZ9XVDVmj36us=";

1212 };

1313

14− nativeBuildInputs = [ bc nukeReferences ];

15− buildInputs = kernel.moduleBuildDependencies;

14+ nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies;

1615

1716 hardeningDisable = [ "pic" "format" ];

1817

@@ -23,13 +22,10 @@ stdenv.mkDerivation rec {

2322 substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"

2423 '';

2524

26− makeFlags = [

27− "ARCH=${stdenv.hostPlatform.linuxArch}"

25+ makeFlags = kernel.makeFlags ++ [

2826 "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

2927 ("CONFIG_PLATFORM_I386_PC=" + (if (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) then "y" else "n"))

3028 ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n"))

31− ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [

32− "CROSS_COMPILE=${stdenv.cc.targetPrefix}"

3329 ];

3430

3531 preInstall = ''

pkgs/os-specific/linux/rtl8192eu/default.nix+1−1

@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {

1919

2020 nativeBuildInputs = kernel.moduleBuildDependencies ++ [ bc ];

2121

22− makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];

22+ makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];

2323

2424 enableParallelBuilding = true;

2525

pkgs/os-specific/linux/rtl8814au/default.nix+2−1

@@ -11,7 +11,8 @@ stdenv.mkDerivation {

1111 sha256 = "0lk3ldff489ggbqmlfi4zvnp1cvxj1b06m0fhpzai82070klzzmj";

1212 };

1313

14− buildInputs = kernel.moduleBuildDependencies;

14+ nativeBuildInputs = kernel.moduleBuildDependencies;

15+ makeFlags = kernel.makeFlags;

1516

1617 hardeningDisable = [ "pic" ];

1718

pkgs/os-specific/linux/rtl8821ce/default.nix+2−2

@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {

1313

1414 hardeningDisable = [ "pic" ];

1515

16− nativeBuildInputs = [ bc ];

17− buildInputs = kernel.moduleBuildDependencies;

16+ nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies;

17+ makeFlags = kernel.makeFlags;

1818

1919 prePatch = ''

2020 substituteInPlace ./Makefile \

pkgs/os-specific/linux/rtl8821cu/default.nix+2−2

@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {

1313

1414 hardeningDisable = [ "pic" ];

1515

16− nativeBuildInputs = [ bc ];

17− buildInputs = kernel.moduleBuildDependencies;

16+ nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies;

17+ makeFlags = kernel.makeFlags;

1818

1919 prePatch = ''

2020 substituteInPlace ./Makefile \

pkgs/os-specific/linux/rtl88x2bu/default.nix+3−3

@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {

1313

1414 hardeningDisable = [ "pic" ];

1515

16− nativeBuildInputs = [ bc ];

17− buildInputs = kernel.moduleBuildDependencies;

16+ nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies;

17+ makeFlags = kernel.makeFlags;

1818

19− prePatch = ''

19+ prePatch = ''

2020 substituteInPlace ./Makefile \

2121 --replace /lib/modules/ "${kernel.dev}/lib/modules/" \

2222 --replace '$(shell uname -r)' "${kernel.modDirVersion}" \

pkgs/os-specific/linux/rtw88/default.nix+2−1

@@ -14,7 +14,8 @@ stdenv.mkDerivation {

1414 hash = "sha256-PRzWXC1lre8gt1GfVdnaG836f5YK57P9a8tG20yef0w=";

1515 };

1616

17− makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];

17+ nativeBuildInputs = kernel.moduleBuildDependencies;

18+ makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];

1819

1920 enableParallelBuilding = true;

2021

pkgs/os-specific/linux/rtw89/default.nix+2−1

@@ -14,7 +14,8 @@ stdenv.mkDerivation {

1414 sha256 = "0cvawyi1ksw9xkr8pzwipsl7b8hnmrb17w5cblyicwih8fqaw632";

1515 };

1616

17− makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];

17+ nativeBuildInputs = kernel.moduleBuildDependencies;

18+ makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];

1819

1920 enableParallelBuilding = true;

2021

pkgs/os-specific/linux/v4l2loopback/default.nix+2−5

@@ -16,12 +16,9 @@ stdenv.mkDerivation rec {

1616 preBuild = ''

1717 substituteInPlace Makefile --replace "modules_install" "INSTALL_MOD_PATH=$out modules_install"

1818 sed -i '/depmod/d' Makefile

19− export PATH=${kmod}/sbin:$PATH

2019 '';

2120

22− nativeBuildInputs = kernel.moduleBuildDependencies;

23−

24− buildInputs = [ kmod ];

21+ nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies;

2522

2623 postInstall = ''

2724 make install-utils PREFIX=$bin

@@ -29,7 +26,7 @@ stdenv.mkDerivation rec {

2926

3027 outputs = [ "out" "bin" ];

3128

32− makeFlags = [

29+ makeFlags = kernel.makeFlags ++ [

3330 "KERNELRELEASE=${kernel.modDirVersion}"

3431 "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

3532 ];

pkgs/os-specific/linux/veikk-linux-driver/default.nix+3−3

@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {

1515

1616 buildInputs = [ kernel ];

1717

18− buildPhase = ''

19− make BUILD_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build

20− '';

18+ makeFlags = kernel.makeFlags ++ [

19+ "BUILD_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

20+ ];

2121

2222 installPhase = ''

2323 mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/veikk

pkgs/os-specific/linux/xmm7360-pci/default.nix+4−2

@@ -11,10 +11,12 @@ stdenv.mkDerivation rec {

1111 sha256 = "1wdb0phqg9rj9g9ycqdya0m7lx24kzjlh25yw0ifp898ddxrrr0c";

1212 };

1313

14− makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];

14+ makeFlags = kernel.makeFlags ++ [

15+ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

16+ "INSTALL_MOD_PATH=${placeholder "out"}"

17+ ];

1518

1619 nativeBuildInputs = kernel.moduleBuildDependencies;

17− INSTALL_MOD_PATH = placeholder "out";

1820 installFlags = [ "DEPMOD=true" ];

1921

2022 meta = with lib; {

pkgs/os-specific/linux/xpadneo/default.nix+1−1

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

1818 nativeBuildInputs = kernel.moduleBuildDependencies;

1919 buildInputs = [ bluez ];

2020

21− makeFlags = [

21+ makeFlags = kernel.makeFlags ++ [

2222 "-C"

2323 "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

2424 "M=$(sourceRoot)"

pkgs/shells/tcsh/default.nix+2−11

@@ -10,17 +10,7 @@ stdenv.mkDerivation rec {

1010 version = "6.24.00";

1111

1212 src = fetchurl {

13− urls = [

14− "https://astron.com/pub/tcsh/${pname}-${version}.tar.gz"

15− "https://astron.com/pub/tcsh/old/${pname}-${version}.tar.gz"

16− "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz"

17− "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz"

18−

19− "ftp://ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz"

20− "ftp://ftp.astron.com/pub/tcsh/old/${pname}-${version}.tar.gz"

21− "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${pname}-${version}.tar.gz"

22− "ftp://ftp.funet.fi/pub/unix/shells/tcsh/old/${pname}-${version}.tar.gz"

23− ];

13+ url = "mirror://tcsh/${pname}-${version}.tar.gz";

2414 hash = "sha256-YL4sUEvY8fpuQksZVkldfnztUqKslNtf0n9La/yPdPA=";

2515 };

2616

@@ -29,6 +19,7 @@ stdenv.mkDerivation rec {

2919 ];

3020

3121 patches = lib.optional stdenv.hostPlatform.isMusl

22+ # Use system malloc

3223 (fetchpatch {

3324 name = "sysmalloc.patch";

3425 url = "https://git.alpinelinux.org/aports/plain/community/tcsh/001-sysmalloc.patch?id=184585c046cdd56512f1a76e426dd799b368f8cf";

pkgs/tools/nix/nix-output-monitor/default.nix+15−9

@@ -6,6 +6,7 @@

66 async,

77 attoparsec,

88 base,

9+ bytestring,

910 cassava,

1011 containers,

1112 data-default,

@@ -36,13 +37,14 @@

3637 unix,

3738 vector,

3839 wcwidth,

40+ word8,

3941}:

4042mkDerivation {

4143 pname = "nix-output-monitor";

42− version = "1.1.1.0";

44+ version = "1.1.2.0";

4345 src = fetchzip {

44− url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v1.1.1.0.tar.gz";

45− sha256 = "1zw7x1snyycl1bp5w7jh8wwnynqvw3g4glr293bnzi5jyirj5wlg";

46+ url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v1.1.2.0.tar.gz";

47+ sha256 = "03qhy4xzika41pxlmvpz3psgy54va72ipn9v1lv33l6369ikrhl1";

4648 };

4749 isLibrary = true;

4850 isExecutable = true;

@@ -51,6 +53,7 @@ mkDerivation {

5153 async

5254 attoparsec

5355 base

56+ bytestring

5457 cassava

5558 containers

5659 data-default

@@ -74,12 +77,14 @@ mkDerivation {

7477 unix

7578 vector

7679 wcwidth

80+ word8

7781 ];

7882 executableHaskellDepends = [

7983 ansi-terminal

8084 async

8185 attoparsec

8286 base

87+ bytestring

8388 cassava

8489 containers

8590 data-default

@@ -103,12 +108,14 @@ mkDerivation {

103108 unix

104109 vector

105110 wcwidth

111+ word8

106112 ];

107113 testHaskellDepends = [

108114 ansi-terminal

109115 async

110116 attoparsec

111117 base

118+ bytestring

112119 cassava

113120 containers

114121 data-default

@@ -134,6 +141,7 @@ mkDerivation {

134141 unix

135142 vector

136143 wcwidth

144+ word8

137145 ];

138146 homepage = "https://github.com/maralorn/nix-output-monitor";

139147 description = "Parses output of nix-build to show additional information";

@@ -148,11 +156,9 @@ mkDerivation {

148156 ${expect}/bin/unbuffer nix-build "\$@" 2>&1 | exec $out/bin/nom

149157 EOF

150158 chmod a+x $out/bin/nom-build

151− installShellCompletion --zsh --name _nom-build ${

152− builtins.toFile "completion.zsh" ''

153− #compdef nom-build

154− compdef nom-build=nix-build

155− ''

156− }

159+ installShellCompletion --zsh --name _nom-build ${builtins.toFile "completion.zsh" ''

160+ #compdef nom-build

161+ compdef nom-build=nix-build

162+ ''}

157163 '';

158164}

pkgs/tools/package-management/nix-eval-jobs/default.nix+2−2

@@ -11,12 +11,12 @@

1111}:

1212stdenv.mkDerivation rec {

1313 pname = "nix-eval-jobs";

14− version = "0.0.3";

14+ version = "0.0.4";

1515 src = fetchFromGitHub {

1616 owner = "nix-community";

1717 repo = pname;

1818 rev = "v${version}";

19− hash = "sha256:0flnqn1vkr55sipii82vwjfkhv4p835d01f6yhlpbalxwy2kr14r";

19+ hash = "sha256-SCwvFlBYUlxCucjMO4GHhEQWZFZt0lRKJncm6hvDx9I=";

2020 };

2121 buildInputs = [

2222 boost

pkgs/tools/package-management/nix/default.nix+4−4

@@ -73,13 +73,13 @@ in lib.makeExtensible (self: {

7373 stable = self.nix_2_7;

7474

7575 unstable = lib.lowPrio (common rec {

76− version = "2.7";

77− suffix = "pre20220221_${lib.substring 0 7 src.rev}";

76+ version = "2.8";

77+ suffix = "pre20220311_${lib.substring 0 7 src.rev}";

7878 src = fetchFromGitHub {

7979 owner = "NixOS";

8080 repo = "nix";

81− rev = "caf51729450d4c57d48ddbef8e855e9bf65f8792";

82− sha256 = "sha256-2fbza6fWPjyTyVEqWIp0jk/Z4epjSDe1u4lbEu+v7Iw=";

81+ rev = "d5322698a2abbc6d141e1d244e17b0d226a2f18b";

82+ sha256 = "sha256-7rQSktGC8+DmeyGOnzFMy1QwAYnw4JJphv+lEwFCwfU=";

8383 };

8484 });

8585})

pkgs/tools/security/gitleaks/default.nix+3−3

@@ -5,16 +5,16 @@

66buildGoModule rec {

77 pname = "gitleaks";

8− version = "8.3.0";

8+ version = "8.4.0";

1010 src = fetchFromGitHub {

1111 owner = "zricethezav";

1212 repo = pname;

1313 rev = "v${version}";

14− sha256 = "sha256-D6leHpGZNQ9Xt4PSU0Dwte6N3bMge7itkZtcUl0mIrQ=";

14+ sha256 = "sha256-z3YGRDgBGpr2hixIayih4wxGWPtYL0EPAuTYVPByzQc=";

1515 };

1616

17− vendorSha256 = "sha256-JZOalUOIeV51Nttm6xeBos+/8fleSBpUiXa8ekVuYJA=";

17+ vendorSha256 = "sha256-J1xX+r+Mph1QkqjK87tqGDkYvPZp0lHgdRhd88WZi1c=";

1818

1919 ldflags = [

2020 "-s"

pkgs/top-level/ocaml-packages.nix+2

@@ -1580,6 +1580,8 @@ in let inherit (pkgs) callPackage; in rec

15801580

15811581 ocamlPackages_4_13 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.13.nix { });

15821582

1583+ ocamlPackages_4_14 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.14.nix { });

1584+

15831585 ocamlPackages_latest = ocamlPackages_4_13;

15841586

15851587 ocamlPackages = ocamlPackages_4_13;

pkgs/top-level/php-packages.nix+2

@@ -144,6 +144,8 @@ lib.makeScope pkgs.newScope (self: with self; {

144144

145145 phing = callPackage ../development/php-packages/phing { };

146146

147+ phive = callPackage ../development/php-packages/phive { };

148+

147149 php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { };

148150

149151 php-parallel-lint = callPackage ../development/php-packages/php-parallel-lint { };