Merge staging into staging-next
commit00bbfccecf90f21b873d90bfeb3b81d7de79cf80
authorFrederik Rietdijk <fridh@fridh.nl>
dateFri 1 May 2020, 09:28 (7 years ago)
parent2d00e861825ecc
176 files changed+644−526
doc/languages-frameworks/go.xml−12
@@ -191,18 +191,6 @@ deis = buildGoPackage rec {
191191 To extract dependency information from a Go package in automated way use <link xlink:href="https://github.com/kamilchm/go2nix">go2nix</link>. It can produce complete derivation and <varname>goDeps</varname> file for Go programs.
192192 </para>
193193
194− <para>
195− <varname>buildGoPackage</varname> produces <xref linkend='chap-multiple-output' xrefstyle="select: title" /> where <varname>bin</varname> includes program binaries. You can test build a Go binary as follows:
196−<screen>
197−<prompt>$ </prompt>nix-build -A deis.bin
198−</screen>
199− or build all outputs with:
200−<screen>
201−<prompt>$ </prompt>nix-build -A deis.all
202−</screen>
203− <varname>bin</varname> output will be installed by default with <varname>nix-env -i</varname> or <varname>systemPackages</varname>.
204− </para>
205−
206194 <para>
207195 You may use Go packages installed into the active Nix profiles by adding the following to your ~/.bashrc:
208196<screen>
nixos/doc/manual/release-notes/rl-2009.xml+5
@@ -317,6 +317,11 @@ php.override {
317317 the <literal>notmuch.emacs</literal> output.
318318 </para>
319319 </listitem>
320+ <listitem>
321+ <para>
322+ The default output of <literal>buildGoPackage</literal> is now <literal>$out</literal> instead of <literal>$bin</literal>.
323+ </para>
324+ </listitem>
320325 </itemizedlist>
321326 </section>
322327</section>
nixos/modules/hardware/all-firmware.nix+1
@@ -51,6 +51,7 @@ in {
5151 rtlwifi_new-firmware
5252 zd1211fw
5353 alsa-firmware
54+ sof-firmware
5455 openelec-dvb-firmware
5556 ] ++ optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) raspberrypiWirelessFirmware
5657 ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [
nixos/modules/programs/singularity.nix+2−2
@@ -5,8 +5,8 @@ let
55 cfg = config.programs.singularity;
66 singularity = pkgs.singularity.overrideAttrs (attrs : {
77 installPhase = attrs.installPhase + ''
8− mv $bin/libexec/singularity/bin/starter-suid $bin/libexec/singularity/bin/starter-suid.orig
9− ln -s /run/wrappers/bin/singularity-suid $bin/libexec/singularity/bin/starter-suid
8+ mv $out/libexec/singularity/bin/starter-suid $out/libexec/singularity/bin/starter-suid.orig
9+ ln -s /run/wrappers/bin/singularity-suid $out/libexec/singularity/bin/starter-suid
1010 '';
1111 });
1212in {
nixos/modules/services/continuous-integration/gitlab-runner.nix+1−1
@@ -127,7 +127,7 @@ in
127127 serviceConfig = {
128128 StateDirectory = "gitlab-runner";
129129 ExecReload= "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
130− ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \
130+ ExecStart = ''${cfg.package}/bin/gitlab-runner run \
131131 --working-directory ${cfg.workDir} \
132132 --config /etc/gitlab-runner/config.toml \
133133 --service gitlab-runner \
nixos/modules/services/misc/confd.nix+1−1
@@ -75,7 +75,7 @@ in {
7575 wantedBy = [ "multi-user.target" ];
7676 after = [ "network.target" ];
7777 serviceConfig = {
78− ExecStart = "${cfg.package.bin}/bin/confd";
78+ ExecStart = "${cfg.package}/bin/confd";
7979 };
8080 };
8181
nixos/modules/services/misc/etcd.nix+1−1
@@ -178,7 +178,7 @@ in {
178178
179179 serviceConfig = {
180180 Type = "notify";
181− ExecStart = "${pkgs.etcd.bin}/bin/etcd";
181+ ExecStart = "${pkgs.etcd}/bin/etcd";
182182 User = "etcd";
183183 LimitNOFILE = 40000;
184184 };
nixos/modules/services/misc/gitea.nix+8−8
@@ -335,7 +335,7 @@ in
335335 description = "gitea";
336336 after = [ "network.target" ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service";
337337 wantedBy = [ "multi-user.target" ];
338− path = [ gitea.bin pkgs.gitAndTools.git ];
338+ path = [ gitea pkgs.gitAndTools.git ];
339339
340340 preStart = let
341341 runConfig = "${cfg.stateDir}/custom/conf/app.ini";
@@ -347,11 +347,11 @@ in
347347 cp -f ${configFile} ${runConfig}
348348
349349 if [ ! -e ${secretKey} ]; then
350− ${gitea.bin}/bin/gitea generate secret SECRET_KEY > ${secretKey}
350+ ${gitea}/bin/gitea generate secret SECRET_KEY > ${secretKey}
351351 fi
352352
353353 if [ ! -e ${jwtSecret} ]; then
354− ${gitea.bin}/bin/gitea generate secret LFS_JWT_SECRET > ${jwtSecret}
354+ ${gitea}/bin/gitea generate secret LFS_JWT_SECRET > ${jwtSecret}
355355 fi
356356
357357 KEY="$(head -n1 ${secretKey})"
@@ -374,7 +374,7 @@ in
374374 HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 6 -type f -wholename "*git/hooks/*")
375375 if [ "$HOOKS" ]
376376 then
377− sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' $HOOKS
377+ sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea}/bin/gitea,g' $HOOKS
378378 sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS
379379 sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS
380380 sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS
@@ -383,7 +383,7 @@ in
383383 # update command option in authorized_keys
384384 if [ -r ${cfg.stateDir}/.ssh/authorized_keys ]
385385 then
386− sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' ${cfg.stateDir}/.ssh/authorized_keys
386+ sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea}/bin/gitea,g' ${cfg.stateDir}/.ssh/authorized_keys
387387 fi
388388 '';
389389
@@ -392,7 +392,7 @@ in
392392 User = cfg.user;
393393 Group = "gitea";
394394 WorkingDirectory = cfg.stateDir;
395− ExecStart = "${gitea.bin}/bin/gitea web";
395+ ExecStart = "${gitea}/bin/gitea web";
396396 Restart = "always";
397397
398398 # Filesystem
@@ -450,7 +450,7 @@ in
450450 description = "gitea dump";
451451 after = [ "gitea.service" ];
452452 wantedBy = [ "default.target" ];
453− path = [ gitea.bin ];
453+ path = [ gitea ];
454454
455455 environment = {
456456 USER = cfg.user;
@@ -461,7 +461,7 @@ in
461461 serviceConfig = {
462462 Type = "oneshot";
463463 User = cfg.user;
464− ExecStart = "${gitea.bin}/bin/gitea dump";
464+ ExecStart = "${gitea}/bin/gitea dump";
465465 WorkingDirectory = cfg.stateDir;
466466 };
467467 };
nixos/modules/services/misc/gogs.nix+3−3
@@ -200,7 +200,7 @@ in
200200 description = "Gogs (Go Git Service)";
201201 after = [ "network.target" ];
202202 wantedBy = [ "multi-user.target" ];
203− path = [ pkgs.gogs.bin ];
203+ path = [ pkgs.gogs ];
204204
205205 preStart = let
206206 runConfig = "${cfg.stateDir}/custom/conf/app.ini";
@@ -230,7 +230,7 @@ in
230230 HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*")
231231 if [ "$HOOKS" ]
232232 then
233− sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gogs,${pkgs.gogs.bin}/bin/gogs,g' $HOOKS
233+ sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gogs,${pkgs.gogs}/bin/gogs,g' $HOOKS
234234 sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS
235235 sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS
236236 sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS
@@ -242,7 +242,7 @@ in
242242 User = cfg.user;
243243 Group = cfg.group;
244244 WorkingDirectory = cfg.stateDir;
245− ExecStart = "${pkgs.gogs.bin}/bin/gogs web";
245+ ExecStart = "${pkgs.gogs}/bin/gogs web";
246246 Restart = "always";
247247 };
248248
nixos/modules/services/misc/leaps.nix+1−1
@@ -55,7 +55,7 @@ in
5555 Restart = "on-failure";
5656 WorkingDirectory = stateDir;
5757 PrivateTmp = true;
58− ExecStart = "${pkgs.leaps.bin}/bin/leaps -path ${toString cfg.path} -address ${cfg.address}:${toString cfg.port}";
58+ ExecStart = "${pkgs.leaps}/bin/leaps -path ${toString cfg.path} -address ${cfg.address}:${toString cfg.port}";
5959 };
6060 };
6161 };
nixos/modules/services/misc/ssm-agent.nix+1−2
@@ -35,7 +35,7 @@ in {
3535
3636 path = [ fake-lsb-release ];
3737 serviceConfig = {
38− ExecStart = "${cfg.package.bin}/bin/agent";
38+ ExecStart = "${cfg.package}/bin/agent";
3939 KillMode = "process";
4040 Restart = "on-failure";
4141 RestartSec = "15min";
@@ -43,4 +43,3 @@ in {
4343 };
4444 };
4545}
46−
nixos/modules/services/monitoring/bosun.nix+1−1
@@ -148,7 +148,7 @@ in {
148148 User = cfg.user;
149149 Group = cfg.group;
150150 ExecStart = ''
151− ${cfg.package.bin}/bin/bosun -c ${configFile}
151+ ${cfg.package}/bin/bosun -c ${configFile}
152152 '';
153153 };
154154 };
nixos/modules/services/monitoring/grafana-reporter.nix+1−1
@@ -59,7 +59,7 @@ in {
5959 "-templates ${cfg.templateDir}"
6060 ];
6161 in {
62− ExecStart = "${pkgs.grafana_reporter.bin}/bin/grafana-reporter ${args}";
62+ ExecStart = "${pkgs.grafana_reporter}/bin/grafana-reporter ${args}";
6363 };
6464 };
6565 };
nixos/modules/services/monitoring/grafana.nix+1−1
@@ -535,7 +535,7 @@ in {
535535 ${optionalString cfg.provision.enable ''
536536 export GF_PATHS_PROVISIONING=${provisionConfDir};
537537 ''}
538− exec ${cfg.package.bin}/bin/grafana-server -homepath ${cfg.dataDir}
538+ exec ${cfg.package}/bin/grafana-server -homepath ${cfg.dataDir}
539539 '';
540540 serviceConfig = {
541541 WorkingDirectory = cfg.dataDir;
nixos/modules/services/monitoring/prometheus/exporters/snmp.nix+1−1
@@ -58,7 +58,7 @@ in
5858 in {
5959 serviceConfig = {
6060 ExecStart = ''
61− ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \
61+ ${pkgs.prometheus-snmp-exporter}/bin/snmp_exporter \
6262 --config.file=${escapeShellArg configFile} \
6363 --log.format=${escapeShellArg cfg.logFormat} \
6464 --log.level=${cfg.logLevel} \
nixos/modules/services/monitoring/scollector.nix+1−1
@@ -118,7 +118,7 @@ in {
118118 serviceConfig = {
119119 User = cfg.user;
120120 Group = cfg.group;
121− ExecStart = "${cfg.package.bin}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}";
121+ ExecStart = "${cfg.package}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}";
122122 };
123123 };
124124
nixos/modules/services/networking/consul.nix+4−4
@@ -179,15 +179,15 @@ in
179179 (filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc);
180180
181181 serviceConfig = {
182− ExecStart = "@${cfg.package.bin}/bin/consul consul agent -config-dir /etc/consul.d"
182+ ExecStart = "@${cfg.package}/bin/consul consul agent -config-dir /etc/consul.d"
183183 + concatMapStrings (n: " -config-file ${n}") configFiles;
184− ExecReload = "${cfg.package.bin}/bin/consul reload";
184+ ExecReload = "${cfg.package}/bin/consul reload";
185185 PermissionsStartOnly = true;
186186 User = if cfg.dropPrivileges then "consul" else null;
187187 Restart = "on-failure";
188188 TimeoutStartSec = "infinity";
189189 } // (optionalAttrs (cfg.leaveOnStop) {
190− ExecStop = "${cfg.package.bin}/bin/consul leave";
190+ ExecStop = "${cfg.package}/bin/consul leave";
191191 });
192192
193193 path = with pkgs; [ iproute gnugrep gawk consul ];
@@ -238,7 +238,7 @@ in
238238
239239 serviceConfig = {
240240 ExecStart = ''
241− ${cfg.alerts.package.bin}/bin/consul-alerts start \
241+ ${cfg.alerts.package}/bin/consul-alerts start \
242242 --alert-addr=${cfg.alerts.listenAddr} \
243243 --consul-addr=${cfg.alerts.consulAddr} \
244244 ${optionalString cfg.alerts.watchChecks "--watch-checks"} \
nixos/modules/services/networking/flannel.nix+3−3
@@ -19,8 +19,8 @@ in {
1919 package = mkOption {
2020 description = "Package to use for flannel";
2121 type = types.package;
22− default = pkgs.flannel.bin;
23− defaultText = "pkgs.flannel.bin";
22+ default = pkgs.flannel;
23+ defaultText = "pkgs.flannel";
2424 };
2525
2626 publicIp = mkOption {
@@ -167,7 +167,7 @@ in {
167167 touch /run/flannel/docker
168168 '' + optionalString (cfg.storageBackend == "etcd") ''
169169 echo "setting network configuration"
170− until ${pkgs.etcdctl.bin}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}'
170+ until ${pkgs.etcdctl}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}'
171171 do
172172 echo "setting network configuration, retry"
173173 sleep 1
nixos/modules/services/networking/skydns.nix+1−1
@@ -83,7 +83,7 @@ in {
8383 SKYDNS_NAMESERVERS = concatStringsSep "," cfg.nameservers;
8484 };
8585 serviceConfig = {
86− ExecStart = "${cfg.package.bin}/bin/skydns";
86+ ExecStart = "${cfg.package}/bin/skydns";
8787 };
8888 };
8989
nixos/modules/services/security/hologram-agent.nix+2−2
@@ -43,12 +43,12 @@ in {
4343 description = "Provide EC2 instance credentials to machines outside of EC2";
4444 after = [ "network.target" ];
4545 wantedBy = [ "multi-user.target" ];
46− requires = [ "network-link-dummy0.service" "network-addresses-dummy0.service" ];
46+ requires = [ "network-link-dummy0.service" "network-addresses-dummy0.service" ];
4747 preStart = ''
4848 /run/current-system/sw/bin/rm -fv /run/hologram.sock
4949 '';
5050 serviceConfig = {
51− ExecStart = "${pkgs.hologram.bin}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}";
51+ ExecStart = "${pkgs.hologram}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}";
5252 };
5353 };
5454
nixos/modules/services/security/hologram-server.nix+1−1
@@ -123,7 +123,7 @@ in {
123123 wantedBy = [ "multi-user.target" ];
124124
125125 serviceConfig = {
126− ExecStart = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}";
126+ ExecStart = "${pkgs.hologram}/bin/hologram-server --debug --conf ${cfgFile}";
127127 };
128128 };
129129 };
nixos/modules/services/security/oauth2_proxy.nix+1−1
@@ -577,7 +577,7 @@ in
577577 serviceConfig = {
578578 User = "oauth2_proxy";
579579 Restart = "always";
580− ExecStart = "${cfg.package.bin}/bin/oauth2_proxy ${configString}";
580+ ExecStart = "${cfg.package}/bin/oauth2_proxy ${configString}";
581581 EnvironmentFile = mkIf (cfg.keyFile != null) cfg.keyFile;
582582 };
583583 };
nixos/modules/services/web-apps/mattermost.nix+1−1
@@ -224,7 +224,7 @@ in
224224 serviceConfig = {
225225 User = "nobody";
226226 Group = "nogroup";
227− ExecStart = "${pkgs.matterircd.bin}/bin/matterircd ${concatStringsSep " " cfg.matterircd.parameters}";
227+ ExecStart = "${pkgs.matterircd}/bin/matterircd ${concatStringsSep " " cfg.matterircd.parameters}";
228228 WorkingDirectory = "/tmp";
229229 PrivateTmp = true;
230230 Restart = "always";
nixos/modules/virtualisation/ecs-agent.nix+1−2
@@ -38,9 +38,8 @@ in {
3838 if [ ! -z "$ECS_DATADIR" ]; then
3939 mkdir -p "$ECS_DATADIR"
4040 fi
41− ${cfg.package.bin}/bin/agent
41+ ${cfg.package}/bin/agent
4242 '';
4343 };
4444 };
4545}
46−
nixos/modules/virtualisation/lxd.nix+1−1
@@ -108,7 +108,7 @@ in
108108 '';
109109
110110 serviceConfig = {
111− ExecStart = "@${cfg.package.bin}/bin/lxd lxd --group lxd";
111+ ExecStart = "@${cfg.package}/bin/lxd lxd --group lxd";
112112 Type = "simple";
113113 KillMode = "process"; # when stopping, leave the containers alone
114114 LimitMEMLOCK = "infinity";
pkgs/applications/blockchains/dcrwallet.nix+2−2
@@ -29,8 +29,8 @@ buildGoPackage rec {
2929 '';
3030
3131 installPhase = ''
32− mkdir -pv $bin/bin
33− cp -v dcrwallet $bin/bin
32+ mkdir -pv $out/bin
33+ cp -v dcrwallet $out/bin
3434 '';
3535
3636
pkgs/applications/blockchains/quorum.nix+2−2
@@ -21,8 +21,8 @@ buildGoPackage rec {
2121 '';
2222
2323 installPhase = ''
24− mkdir -pv $bin/bin
25− cp -v build/bin/geth build/bin/bootnode build/bin/swarm $bin/bin
24+ mkdir -pv $out/bin
25+ cp -v build/bin/geth build/bin/bootnode build/bin/swarm $out/bin
2626 '';
2727
2828 meta = with stdenv.lib; {
pkgs/applications/misc/overmind/default.nix+1−1
@@ -8,7 +8,7 @@ buildGoPackage rec {
88 nativeBuildInputs = [ makeWrapper ];
99
1010 postInstall = ''
11− wrapProgram "$bin/bin/overmind" --prefix PATH : "${lib.makeBinPath [ tmux which ]}"
11+ wrapProgram "$out/bin/overmind" --prefix PATH : "${lib.makeBinPath [ tmux which ]}"
1212 '';
1313
1414 src = fetchFromGitHub {
pkgs/applications/networking/cluster/k3s/default.nix+4−4
@@ -126,8 +126,8 @@ let
126126 installPhase = ''
127127 pushd go/src/${goPackagePath}
128128
129− mkdir -p "$bin/bin"
130− install -m 0755 -t "$bin/bin" ./bin/*
129+ mkdir -p "$out/bin"
130+ install -m 0755 -t "$out/bin" ./bin/*
131131
132132 popd
133133 '';
@@ -181,8 +181,8 @@ let
181181 installPhase = ''
182182 pushd go/src/${goPackagePath}
183183
184− mkdir -p "$bin/bin"
185− install -m 0755 -t "$bin/bin" ./dist/artifacts/k3s
184+ mkdir -p "$out/bin"
185+ install -m 0755 -t "$out/bin" ./dist/artifacts/k3s
186186
187187 popd
188188 '';
pkgs/applications/networking/cluster/kompose/default.nix+1−1
@@ -16,7 +16,7 @@ buildGoPackage rec {
1616 nativeBuildInputs = [ installShellFiles ];
1717 postInstall = ''
1818 for shell in bash zsh; do
19− $bin/bin/kompose completion $shell > kompose.$shell
19+ $out/bin/kompose completion $shell > kompose.$shell
2020 installShellCompletion kompose.$shell
2121 done
2222 '';
pkgs/applications/networking/cluster/kops/default.nix+1−1
@@ -34,7 +34,7 @@ let
3434
3535 postInstall = ''
3636 for shell in bash zsh; do
37− $bin/bin/kops completion $shell > kops.$shell
37+ $out/bin/kops completion $shell > kops.$shell
3838 installShellCompletion kops.$shell
3939 done
4040 '';
pkgs/applications/networking/cluster/minishift/default.nix+1−1
@@ -48,7 +48,7 @@ in buildGoPackage rec {
4848 '';
4949
5050 postInstall = ''
51− wrapProgram "$bin/bin/minishift" \
51+ wrapProgram "$out/bin/minishift" \
5252 --prefix PATH ':' '${lib.makeBinPath [ docker-machine-kvm openshift ]}'
5353 '';
5454
pkgs/applications/networking/cluster/openshift/default.nix+2−2
@@ -61,8 +61,8 @@ in buildGoPackage rec {
6161 '';
6262
6363 installPhase = ''
64− mkdir -p $bin/bin
65− cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$bin/bin/"
64+ mkdir -p $out/bin
65+ cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/"
6666 installShellCompletion --bash contrib/completions/bash/*
6767 installShellCompletion --zsh contrib/completions/zsh/*
6868 '';
pkgs/applications/networking/cluster/stern/default.nix+1−1
@@ -20,7 +20,7 @@ buildGoPackage rec {
2020 nativeBuildInputs = [ installShellFiles ];
2121
2222 postInstall =
23− let stern = if isCrossBuild then buildPackages.stern else "$bin"; in
23+ let stern = if isCrossBuild then buildPackages.stern else "$out"; in
2424 ''
2525 for shell in bash zsh; do
2626 ${stern}/bin/stern --completion $shell > stern.$shell
pkgs/applications/networking/cluster/terraform/default.nix+2−2
@@ -26,7 +26,7 @@ let
2626
2727 postInstall = ''
2828 # remove all plugins, they are part of the main binary now
29− for i in $bin/bin/*; do
29+ for i in $out/bin/*; do
3030 if [[ $(basename $i) != terraform ]]; then
3131 rm "$i"
3232 fi
@@ -88,7 +88,7 @@ let
8888
8989 buildCommand = ''
9090 mkdir -p $out/bin/
91− makeWrapper "${terraform.bin}/bin/terraform" "$out/bin/terraform" \
91+ makeWrapper "${terraform}/bin/terraform" "$out/bin/terraform" \
9292 --set NIX_TERRAFORM_PLUGIN_DIR "${
9393 buildEnv {
9494 name = "tf-plugin-env";
pkgs/applications/networking/cluster/terragrunt/default.nix+1−1
@@ -23,7 +23,7 @@ buildGoPackage rec {
2323 '';
2424
2525 postInstall = ''
26− wrapProgram $bin/bin/terragrunt \
26+ wrapProgram $out/bin/terragrunt \
2727 --set TERRAGRUNT_TFPATH ${lib.getBin terraform.full}/bin/terraform
2828 '';
2929
pkgs/applications/networking/sync/rclone/default.nix+2−2
@@ -15,7 +15,7 @@ buildGoPackage rec {
1515
1616 subPackages = [ "." ];
1717
18− outputs = [ "bin" "out" "man" ];
18+ outputs = [ "out" "man" ];
1919
2020 nativeBuildInputs = [ installShellFiles ];
2121
@@ -23,7 +23,7 @@ buildGoPackage rec {
2323 let
2424 rcloneBin =
2525 if stdenv.buildPlatform == stdenv.hostPlatform
26− then "$bin"
26+ then "$out"
2727 else stdenv.lib.getBin buildPackages.rclone;
2828 in
2929 ''
pkgs/applications/version-management/git-and-tools/grv/default.nix+1−1
@@ -36,7 +36,7 @@ buildGoPackage {
3636
3737 installPhase = ''
3838 runHook preInstall
39− install -D grv $bin/bin/grv
39+ install -D grv $out/bin/grv
4040 runHook postInstall
4141 '';
4242
pkgs/applications/version-management/gitea/default.nix+2−2
@@ -44,7 +44,7 @@ buildGoPackage rec {
4444 )
4545 '';
4646
47− outputs = [ "bin" "out" "data" ];
47+ outputs = [ "out" "data" ];
4848
4949 postInstall = ''
5050 mkdir $data
@@ -52,7 +52,7 @@ buildGoPackage rec {
5252 mkdir -p $out
5353 cp -R ./go/src/${goPackagePath}/options/locale $out/locale
5454
55− wrapProgram $bin/bin/gitea \
55+ wrapProgram $out/bin/gitea \
5656 --prefix PATH : ${makeBinPath [ bash git gzip openssh ]}
5757 '';
5858
pkgs/applications/version-management/gitlab/gitaly/default.nix+1−1
@@ -65,7 +65,7 @@ in buildGoPackage rec {
6565 "'/run/gitlab/shell-config.yml'"
6666 '';
6767
68− outputs = [ "bin" "out" "ruby" ];
68+ outputs = [ "out" "ruby" ];
6969
7070 meta = with stdenv.lib; {
7171 homepage = "https://gitlab.com/gitlab-org/gitaly";
pkgs/applications/version-management/gitlab/gitlab-shell/default.nix+2−2
@@ -18,8 +18,8 @@ buildGoPackage rec {
1818 goDeps = ./deps.nix;
1919
2020 postInstall = ''
21− cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $bin/bin
22− cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $bin/
21+ cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $out/bin
22+ cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $out/
2323 '';
2424
2525 meta = with stdenv.lib; {
pkgs/applications/version-management/gogs/default.nix+2−2
@@ -34,13 +34,13 @@ buildGoPackage rec {
3434 ( optional sqliteSupport "sqlite"
3535 ++ optional pamSupport "pam");
3636
37− outputs = [ "bin" "out" "data" ];
37+ outputs = [ "out" "data" ];
3838
3939 postInstall = ''
4040 mkdir $data
4141 cp -R $src/{public,templates} $data
4242
43− wrapProgram $bin/bin/gogs \
43+ wrapProgram $out/bin/gogs \
4444 --prefix PATH : ${makeBinPath [ bash git gzip openssh ]}
4545 '';
4646
pkgs/applications/virtualization/containerd/default.nix+2−2
@@ -14,7 +14,7 @@ buildGoPackage rec {
1414 };
1515
1616 goPackagePath = "github.com/containerd/containerd";
17− outputs = [ "bin" "out" "man" ];
17+ outputs = [ "out" "man" ];
1818
1919 nativeBuildInputs = [ go-md2man utillinux ];
2020
@@ -33,7 +33,7 @@ buildGoPackage rec {
3333
3434 installPhase = ''
3535 for b in bin/*; do
36− install -Dm555 $b $bin/$b
36+ install -Dm555 $b $out/$b
3737 done
3838
3939 make man
pkgs/applications/virtualization/cri-o/default.nix+3−4
@@ -30,7 +30,6 @@ buildGoPackage rec {
3030 sha256 = "142flmv54pj48rjqkd26fbxrcbx2cv6pdmrc33jgyvn6r99zliah";
3131 };
3232
33− outputs = [ "bin" "out" ];
3433 nativeBuildInputs = [ git pkgconfig which ];
3534 buildInputs = [ btrfs-progs gpgme libapparmor libassuan libgpgerror
3635 libseccomp libselinux lvm2 ]
@@ -43,9 +42,9 @@ buildGoPackage rec {
4342 make binaries BUILDTAGS="$BUILDTAGS"
4443 '';
4544 installPhase = ''
46− install -Dm755 bin/crio $bin/bin/crio${flavor}
47− install -Dm755 bin/crio-status $bin/bin/crio-status${flavor}
48− install -Dm755 bin/pinns $bin/bin/pinns${flavor}
45+ install -Dm755 bin/crio $out/bin/crio${flavor}
46+ install -Dm755 bin/crio-status $out/bin/crio-status${flavor}
47+ install -Dm755 bin/pinns $out/bin/pinns${flavor}
4948 '';
5049
5150 meta = with stdenv.lib; {
pkgs/applications/virtualization/docker-slim/default.nix+1−1
@@ -33,7 +33,7 @@ buildGoPackage rec {
3333 # docker-slim tries to create its state dir next to the binary (inside the nix
3434 # store), so we set it to use the working directory at the time of invocation
3535 postInstall = ''
36− wrapProgram "$bin/bin/docker-slim" --add-flags '--state-path "$(pwd)"'
36+ wrapProgram "$out/bin/docker-slim" --add-flags '--state-path "$(pwd)"'
3737 '';
3838
3939 meta = with stdenv.lib; {
pkgs/applications/virtualization/docker/proxy.nix+1−1
@@ -16,7 +16,7 @@ buildGoPackage rec {
1616 goDeps = null;
1717
1818 installPhase = ''
19− install -m755 -D ./go/bin/proxy $bin/bin/docker-proxy
19+ install -m755 -D ./go/bin/proxy $out/bin/docker-proxy
2020 '';
2121
2222 meta = with stdenv.lib; {
pkgs/applications/virtualization/podman/default.nix+2−2
@@ -25,7 +25,7 @@ buildGoPackage rec {
2525
2626 goPackagePath = "github.com/containers/libpod";
2727
28− outputs = [ "bin" "out" "man" ];
28+ outputs = [ "out" "man" ];
2929
3030 nativeBuildInputs = [ pkg-config go-md2man installShellFiles ];
3131
@@ -40,7 +40,7 @@ buildGoPackage rec {
4040 '';
4141
4242 installPhase = ''
43− install -Dm555 bin/podman $bin/bin/podman
43+ install -Dm555 bin/podman $out/bin/podman
4444 installShellCompletion --bash completions/bash/podman
4545 installShellCompletion --zsh completions/zsh/_podman
4646 MANDIR=$man/share/man make install.man
pkgs/applications/virtualization/runc/default.nix+2−2
@@ -22,7 +22,7 @@ buildGoPackage rec {
2222 };
2323
2424 goPackagePath = "github.com/opencontainers/runc";
25− outputs = [ "bin" "out" "man" ];
25+ outputs = [ "out" "man" ];
2626
2727 nativeBuildInputs = [ go-md2man installShellFiles pkg-config which ];
2828 buildInputs = [ libseccomp libapparmor apparmor-parser ];
@@ -38,7 +38,7 @@ buildGoPackage rec {
3838 '';
3939
4040 installPhase = ''
41− install -Dm755 runc $bin/bin/runc
41+ install -Dm755 runc $out/bin/runc
4242 installManPage man/*/*
4343 '';
4444
pkgs/applications/virtualization/singularity/default.nix+6−6
@@ -42,7 +42,7 @@ buildGoPackage rec {
4242 patchShebangs .
4343 sed -i 's|defaultPath := "[^"]*"|defaultPath := "${stdenv.lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go
4444
45− ./mconfig -V ${version} -p $bin --localstatedir=/var
45+ ./mconfig -V ${version} -p $out --localstatedir=/var
4646
4747 # Don't install SUID binaries
4848 sed -i 's/-m 4755/-m 755/g' builddir/Makefile
@@ -54,16 +54,16 @@ buildGoPackage rec {
5454 '';
5555
5656 installPhase = ''
57− make -C builddir install LOCALSTATEDIR=$bin/var
58− chmod 755 $bin/libexec/singularity/bin/starter-suid
59− wrapProgram $bin/bin/singularity --prefix PATH : ${stdenv.lib.makeBinPath propagatedBuildInputs}
57+ make -C builddir install LOCALSTATEDIR=$out/var
58+ chmod 755 $out/libexec/singularity/bin/starter-suid
59+ wrapProgram $out/bin/singularity --prefix PATH : ${stdenv.lib.makeBinPath propagatedBuildInputs}
6060 '';
6161
6262 postFixup = ''
63− find $bin/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true
63+ find $out/libexec/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true
6464
6565 # These etc scripts shouldn't have their paths patched
66− cp etc/actions/* $bin/etc/singularity/actions/
66+ cp etc/actions/* $out/etc/singularity/actions/
6767 '';
6868
6969 meta = with stdenv.lib; {
pkgs/build-support/bintools-wrapper/default.nix+4−3
@@ -85,7 +85,7 @@ stdenv.mkDerivation {
8585
8686 inherit targetPrefix infixSalt;
8787
88− outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ];
88+ outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (bintools ? info) "info");
8989
9090 passthru = {
9191 inherit bintools libc nativeTools nativeLibc nativePrefix;
@@ -259,14 +259,15 @@ stdenv.mkDerivation {
259259 printWords ${bintools_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
260260 ''
261261
262− + optionalString propagateDoc ''
262+ + optionalString propagateDoc (''
263263 ##
264264 ## Man page and info support
265265 ##
266266
267267 ln -s ${bintools.man} $man
268+ '' + optionalString (bintools ? info) ''
268269 ln -s ${bintools.info} $info
269− ''
270+ '')
270271
271272 + ''
272273 ##
pkgs/data/fonts/liberation-fonts/default.nixnew file+67
@@ -0,0 +1,67 @@
1+{ stdenv, fetchFromGitHub, fontforge, python3 }:
2+let
3+ inherit (python3.pkgs) fonttools;
4+
5+ common =
6+ { version, repo, sha256, nativeBuildInputs, postPatch ? null }:
7+ stdenv.mkDerivation rec {
8+ pname = "liberation-fonts";
9+ inherit version;
10+
11+ src = fetchFromGitHub {
12+ owner = "liberationfonts";
13+ rev = version;
14+ inherit repo sha256;
15+ };
16+
17+ inherit nativeBuildInputs postPatch;
18+
19+ installPhase = ''
20+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
21+
22+ install -m444 -Dt $out/share/doc/${pname}-${version} AUTHORS || true
23+ install -m444 -Dt $out/share/doc/${pname}-${version} ChangeLog || true
24+ install -m444 -Dt $out/share/doc/${pname}-${version} COPYING || true
25+ install -m444 -Dt $out/share/doc/${pname}-${version} License.txt || true
26+ install -m444 -Dt $out/share/doc/${pname}-${version} README || true
27+ '';
28+
29+ meta = with stdenv.lib; {
30+ description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New";
31+ longDescription = ''
32+ The Liberation Fonts are intended to be replacements for the three most
33+ commonly used fonts on Microsoft systems: Times New Roman, Arial, and
34+ Courier New. Since 2012 they are based on croscore fonts.
35+
36+ There are three sets: Sans (a substitute for Arial, Albany, Helvetica,
37+ Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times
38+ New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono
39+ (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and
40+ Bitstream Vera Sans Mono).
41+ '';
42+
43+ license = licenses.ofl;
44+ homepage = "https://github.com/liberationfonts";
45+ maintainers = with maintainers; [ raskin ];
46+ };
47+ };
48+in
49+{
50+ liberation_ttf_v1 = common {
51+ repo = "liberation-1.7-fonts";
52+ version = "1.07.5";
53+ nativeBuildInputs = [ fontforge ];
54+ sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v";
55+ };
56+ liberation_ttf_v2 = common {
57+ repo = "liberation-fonts";
58+ version = "2.1.0";
59+ nativeBuildInputs = [ fontforge fonttools ];
60+ postPatch = ''
61+ substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \
62+ 'font = ttLib.TTFont(fontfile)' \
63+ 'font = ttLib.TTFont(fontfile, recalcTimestamp=False)'
64+ '';
65+ sha256 = "03xpzaas264x5n6qisxkhc68pkpn32m7y78qdm3rdkxdwi8mv8mz";
66+ };
67+}
pkgs/data/fonts/redhat-liberation-fonts/default.nixdeleted−70
@@ -1,70 +0,0 @@
1−{ stdenv, fetchFromGitHub, fontforge, python3 }:
2−
3−let
4− inherit (python3.pkgs) fonttools;
5−
6− common =
7− { version, repo, sha256, nativeBuildInputs, postPatch ? null }:
8− stdenv.mkDerivation rec {
9− pname = "liberation-fonts";
10− inherit version;
11−
12− src = fetchFromGitHub {
13− owner = "liberationfonts";
14− rev = version;
15− inherit repo sha256;
16− };
17−
18− inherit nativeBuildInputs postPatch;
19−
20− installPhase = ''
21− find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
22−
23− install -m444 -Dt $out/share/doc/${pname}-${version} AUTHORS || true
24− install -m444 -Dt $out/share/doc/${pname}-${version} ChangeLog || true
25− install -m444 -Dt $out/share/doc/${pname}-${version} COPYING || true
26− install -m444 -Dt $out/share/doc/${pname}-${version} License.txt || true
27− install -m444 -Dt $out/share/doc/${pname}-${version} README || true
28− '';
29−
30− meta = with stdenv.lib; {
31− description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New";
32− longDescription = ''
33− The Liberation Fonts are intended to be replacements for the three most
34− commonly used fonts on Microsoft systems: Times New Roman, Arial, and
35− Courier New. Since 2012 they are based on croscore fonts.
36−
37− There are three sets: Sans (a substitute for Arial, Albany, Helvetica,
38− Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times
39− New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono
40− (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and
41− Bitstream Vera Sans Mono).
42− '';
43−
44− license = licenses.ofl;
45− homepage = "https://github.com/liberationfonts";
46− maintainers = [
47− maintainers.raskin
48− ];
49− };
50− };
51−
52−in {
53− liberation_ttf_v1 = common {
54− repo = "liberation-1.7-fonts";
55− version = "1.07.5";
56− nativeBuildInputs = [ fontforge ];
57− sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v";
58− };
59− liberation_ttf_v2 = common {
60− repo = "liberation-fonts";
61− version = "2.00.4";
62− nativeBuildInputs = [ fontforge fonttools ];
63− postPatch = ''
64− substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \
65− 'font = ttLib.TTFont(fontfile)' \
66− 'font = ttLib.TTFont(fontfile, recalcTimestamp=False)'
67− '';
68− sha256 = "14bn1zlhyr4qaz5z2sx4h115pnbd41ix1vky8fxm2lx76xrjjiaa";
69− };
70−}
pkgs/data/misc/iana-etc/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, fetchzip }:
22
33let
4− version = "20190731";
4+ version = "20200407";
55in fetchzip {
66 name = "iana-etc-${version}";
77 url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
8− sha256 = "0vqr4zm53zn7z75ynmf59xfrlhpyk8f41xd6i4v8j0f7k6hfdvpi";
8+ sha256 = "1zmqim0l4lz5xbq7w2wi48fzsvg2msyw6c80dzw4vxll31frpy18";
99
1010 postFetch = ''
1111 tar -xzvf $downloadedFile --strip-components=1
pkgs/desktops/deepin/dde-api/default.nix+1−3
@@ -37,8 +37,6 @@ buildGoPackage rec {
3737
3838 goDeps = ./deps.nix;
3939
40− outputs = [ "out" ];
41−
4240 nativeBuildInputs = [
4341 pkgconfig
4442 deepin-gettext-tools # build
@@ -109,7 +107,7 @@ buildGoPackage rec {
109107 installPhase = ''
110108 make install PREFIX="$out" SYSTEMD_LIB_DIR="$out/lib" -C go/src/${goPackagePath}
111109 mv $out/share/gocode $out/share/go
112− remove-references-to -t ${go} $out/bin/* $out/lib/deepin-api/*
110+ remove-references-to -t ${go} $out/lib/deepin-api/*
113111 '';
114112
115113 postFixup = ''
pkgs/desktops/deepin/dde-daemon/default.nix−2
@@ -29,8 +29,6 @@ buildGoPackage rec {
2929
3030 goDeps = ./deps.nix;
3131
32− outputs = [ "out" ];
33−
3432 nativeBuildInputs = [
3533 pkgconfig
3634 dbus-factory
pkgs/desktops/deepin/startdde/default.nix+1−3
@@ -22,8 +22,6 @@ buildGoPackage rec {
2222
2323 goDeps = ./deps.nix;
2424
25− outputs = [ "out" ];
26−
2725 nativeBuildInputs = [
2826 pkgconfig
2927 dbus-factory
@@ -114,7 +112,7 @@ buildGoPackage rec {
114112 installPhase = ''
115113 make install PREFIX="$out" -C go/src/${goPackagePath}
116114 rm -rf $out/share/lightdm # this is uselesss for NixOS
117− remove-references-to -t ${go} $out/bin/* $out/sbin/*
115+ remove-references-to -t ${go} $out/sbin/*
118116 '';
119117
120118 postFixup = ''
pkgs/development/compilers/llvm/10/compiler-rt.nix+4−1
@@ -55,7 +55,10 @@ stdenv.mkDerivation rec {
5555 # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
5656 # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
5757 # a flag and turn the flag off during the stdenv build.
58− postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
58+ postPatch = ''
59+ substituteInPlace cmake/builtin-config-ix.cmake \
60+ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
61+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
5962 substituteInPlace cmake/config-ix.cmake \
6063 --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
6164 '' + stdenv.lib.optionalString (useLLVM) ''
pkgs/development/compilers/llvm/10/llvm.nix+1
@@ -159,6 +159,7 @@ in stdenv.mkDerivation (rec {
159159
160160 enableParallelBuilding = true;
161161
162+ requiredSystemFeatures = [ "big-parallel" ];
162163 meta = {
163164 description = "Collection of modular and reusable compiler and toolchain technologies";
164165 homepage = "https://llvm.org/";
pkgs/development/compilers/llvm/6/compiler-rt.nix+4−1
@@ -54,7 +54,10 @@ stdenv.mkDerivation {
5454 # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
5555 # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
5656 # a flag and turn the flag off during the stdenv build.
57− postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
57+ postPatch = ''
58+ substituteInPlace cmake/builtin-config-ix.cmake \
59+ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
60+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
5861 substituteInPlace cmake/config-ix.cmake \
5962 --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
6063 '' + stdenv.lib.optionalString (useLLVM) ''
pkgs/development/compilers/llvm/6/llvm.nix+1
@@ -147,6 +147,7 @@ stdenv.mkDerivation ({
147147
148148 enableParallelBuilding = true;
149149
150+ requiredSystemFeatures = [ "big-parallel" ];
150151 meta = {
151152 description = "Collection of modular and reusable compiler and toolchain technologies";
152153 homepage = "https://llvm.org/";
pkgs/development/compilers/llvm/7/compiler-rt.nix+4−1
@@ -55,7 +55,10 @@ stdenv.mkDerivation {
5555 # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
5656 # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
5757 # a flag and turn the flag off during the stdenv build.
58− postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
58+ postPatch = ''
59+ substituteInPlace cmake/builtin-config-ix.cmake \
60+ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
61+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
5962 substituteInPlace cmake/config-ix.cmake \
6063 --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
6164 '' + stdenv.lib.optionalString (useLLVM) ''
pkgs/development/compilers/llvm/7/llvm.nix+1
@@ -168,6 +168,7 @@ in stdenv.mkDerivation ({
168168
169169 enableParallelBuilding = true;
170170
171+ requiredSystemFeatures = [ "big-parallel" ];
171172 meta = {
172173 description = "Collection of modular and reusable compiler and toolchain technologies";
173174 homepage = "https://llvm.org/";
pkgs/development/compilers/llvm/8/compiler-rt.nix+4−1
@@ -55,7 +55,10 @@ stdenv.mkDerivation {
5555 # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
5656 # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
5757 # a flag and turn the flag off during the stdenv build.
58− postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
58+ postPatch = ''
59+ substituteInPlace cmake/builtin-config-ix.cmake \
60+ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
61+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
5962 substituteInPlace cmake/config-ix.cmake \
6063 --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
6164 '' + stdenv.lib.optionalString (useLLVM) ''
pkgs/development/compilers/llvm/8/llvm.nix+1
@@ -143,6 +143,7 @@ in stdenv.mkDerivation ({
143143
144144 enableParallelBuilding = true;
145145
146+ requiredSystemFeatures = [ "big-parallel" ];
146147 meta = {
147148 description = "Collection of modular and reusable compiler and toolchain technologies";
148149 homepage = "https://llvm.org/";
pkgs/development/compilers/llvm/9/compiler-rt.nix+4−1
@@ -54,7 +54,10 @@ stdenv.mkDerivation rec {
5454 # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
5555 # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
5656 # a flag and turn the flag off during the stdenv build.
57− postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
57+ postPatch = ''
58+ substituteInPlace cmake/builtin-config-ix.cmake \
59+ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
60+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
5861 substituteInPlace cmake/config-ix.cmake \
5962 --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
6063 '' + stdenv.lib.optionalString (useLLVM) ''
pkgs/development/compilers/llvm/9/llvm.nix+1
@@ -160,6 +160,7 @@ in stdenv.mkDerivation (rec {
160160
161161 enableParallelBuilding = true;
162162
163+ requiredSystemFeatures = [ "big-parallel" ];
163164 meta = {
164165 description = "Collection of modular and reusable compiler and toolchain technologies";
165166 homepage = "https://llvm.org/";
pkgs/development/go-packages/generic/default.nix+3−6
@@ -203,15 +203,15 @@ let
203203 installPhase = args.installPhase or ''
204204 runHook preInstall
205205
206− mkdir -p $bin
206+ mkdir -p $out
207207 dir="$NIX_BUILD_TOP/go/bin"
208− [ -e "$dir" ] && cp -r $dir $bin
208+ [ -e "$dir" ] && cp -r $dir $out
209209
210210 runHook postInstall
211211 '';
212212
213213 preFixup = preFixup + ''
214− find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
214+ find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
215215 '';
216216
217217 strictDeps = true;
@@ -235,9 +235,6 @@ let
235235
236236 enableParallelBuilding = enableParallelBuilding;
237237
238− # I prefer to call this dev but propagatedBuildInputs expects $out to exist
239− outputs = args.outputs or [ "bin" "out" ];
240−
241238 meta = {
242239 # Add default meta information
243240 homepage = "https://${goPackagePath}";
pkgs/development/libraries/c-blosc/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "c-blosc";
5− version = "1.17.1";
5+ version = "1.18.1";
66
77 src = fetchFromGitHub {
88 owner = "Blosc";
99 repo = "c-blosc";
1010 rev = "v${version}";
11− sha256 = "1asp3xmbvdnz1mj1pl1ykzz61cybvkxz3cdn43zh1z0x1qlgwm80";
11+ sha256 = "1ywq8j70149859vvs19wgjq89d6xsvvmvm2n1dmkzpchxgrvnw70";
1212 };
1313
1414 buildInputs = [ cmake ];
pkgs/development/libraries/glew/default.nix+2−2
@@ -4,11 +4,11 @@
44with stdenv.lib;
55
66stdenv.mkDerivation rec {
7− name = "glew-2.1.0";
7+ name = "glew-2.2.0";
88
99 src = fetchurl {
1010 url = "mirror://sourceforge/glew/${name}.tgz";
11− sha256 = "159wk5dc0ykjbxvag5i1m2mhp23zkk6ra04l26y3jc3nwvkr3ph4";
11+ sha256 = "1qak8f7g1iswgswrgkzc7idk7jmqgwrs58fhg2ai007v7j4q5z6l";
1212 };
1313
1414 outputs = [ "bin" "out" "dev" "doc" ];
pkgs/development/libraries/gobject-introspection/setup-hook.sh+8−1
@@ -18,7 +18,14 @@ giDiscoverSelf() {
1818 fi
1919}
2020
21−preFixupHooks+=(giDiscoverSelf)
21+# gappsWrapperArgsHook expects GI_TYPELIB_PATH variable to be set by this.
22+# Until we have dependency mechanism in generic builder, we need to use this ugly hack.
23+if [[ " ${preFixupPhases:-} " =~ " gappsWrapperArgsHook " ]]; then
24+ preFixupPhases+=" "
25+ preFixupPhases="${preFixupPhases/ gappsWrapperArgsHook / giDiscoverSelf gappsWrapperArgsHook }"
26+else
27+ preFixupPhases+=" giDiscoverSelf"
28+fi
2229
2330_multioutMoveGlibGir() {
2431 moveToOutput share/gir-1.0 "${!outputDev}"
pkgs/development/libraries/gtk/3.x.nix+14−4
@@ -48,7 +48,7 @@ with stdenv.lib;
4848
4949stdenv.mkDerivation rec {
5050 pname = "gtk+3";
51− version = "3.24.18";
51+ version = "3.24.20";
5252
5353 outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc";
5454 outputBin = "dev";
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
6060
6161 src = fetchurl {
6262 url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
63− sha256 = "1lia2ybd1661j6mvrc00iyd50gm7sy157bdzlyf4mr028rzzzspm";
63+ sha256 = "Laxp9xbo0EunqVCRWJ4rquyV3KzpMssVg5Fj20ebHfM=";
6464 };
6565
6666 patches = [
@@ -71,12 +71,17 @@ stdenv.mkDerivation rec {
7171 sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
7272 })
7373
74− # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002
75− ./patches/01-build-Fix-path-handling-in-pkgconfig.patch
74+ # Fix path handling in pkg-config
75+ # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1793
76+ (fetchpatch {
77+ url = "https://gitlab.gnome.org/GNOME/gtk/commit/6d9db8610eff8c12d594d53b7813d9eea1247801.patch";
78+ sha256 = "QHseZWgPlZBDEM2dIVixUJkGZMCaYjahkLmSCqCcoWU=";
79+ })
7680 ] ++ optionals stdenv.isDarwin [
7781 # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
7882 # let’s drop that dependency in similar way to how other parts of the library do it
7983 # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33
84+ # https://gitlab.gnome.org/GNOME/gtk/merge_requests/536
8085 ./patches/3.0-darwin-x11.patch
8186 ];
8287
@@ -92,6 +97,11 @@ stdenv.mkDerivation rec {
9297 NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
9398
9499 postPatch = ''
100+ # TODO: Remove in 3.24.21
101+ # https://gitlab.gnome.org/GNOME/gtk/issues/2669
102+ echo "${stdenv.shell}" > check-version.py
103+ chmod +x check-version.py
104+
95105 files=(
96106 build-aux/meson/post-install.py
97107 demos/gtk-demo/geninclude.py
pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patchdeleted−30
@@ -1,30 +0,0 @@
1−From 7b692e618c4183a51af3d3b0037f106c4fec2355 Mon Sep 17 00:00:00 2001
2−From: worldofpeace <worldofpeace@protonmail.ch>
3−Date: Fri, 19 Jul 2019 13:32:57 -0400
4−Subject: [PATCH] build: Fix path handling in pkgconfig
5−
6−---
7− meson.build | 6 +++---
8− 1 file changed, 3 insertions(+), 3 deletions(-)
9−
10−diff --git a/meson.build b/meson.build
11−index 36913b3f04..161b378ba5 100644
12−--- a/meson.build
13−+++ b/meson.build
14−@@ -834,10 +834,10 @@ configure_file(input: 'config.h.meson',
15− # pkg-config files - bit of a mess all of this
16− pkgconf = configuration_data()
17−
18−-pkgconf.set('prefix', get_option('prefix'))
19−+pkgconf.set('prefix', gtk_prefix)
20− pkgconf.set('exec_prefix', '${prefix}')
21−-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
22−-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
23−+pkgconf.set('libdir', gtk_libdir)
24−+pkgconf.set('includedir', join_paths('${prefix}', gtk_includedir))
25− pkgconf.set('GTK_API_VERSION', gtk_api_version)
26− pkgconf.set('VERSION', meson.project_version())
27− pkgconf.set('GTK_BINARY_VERSION', gtk_binary_version)
28−--
29−2.22.0
30−
pkgs/development/libraries/ilmbase/default.nix+9−14
@@ -1,9 +1,13 @@
1−{ stdenv, lib, buildPackages, automake, autoconf, libtool, which,
2− fetchpatch, openexr }:
1+{ stdenv
2+, buildPackages
3+, cmake
4+, libtool
5+, openexr
6+}:
37
48stdenv.mkDerivation rec {
59 pname = "ilmbase";
6− version = lib.getVersion openexr;
10+ version = stdenv.lib.getVersion openexr;
711
812 # the project no longer provides separate tarballs. We may even want to merge
913 # the ilmbase package into openexr in the future.
@@ -13,19 +17,10 @@ stdenv.mkDerivation rec {
1317
1418 outputs = [ "out" "dev" ];
1519
16− preConfigure = ''
17− patchShebangs ./bootstrap
18− ./bootstrap
19− '';
20−
20+ nativeBuildInputs = [ cmake libtool ];
2121 depsBuildBuild = [ buildPackages.stdenv.cc ];
22− nativeBuildInputs = [ automake autoconf libtool which ];
23−
24− NIX_CFLAGS_LINK = "-pthread";
2522
26− patches = [
27− ./cross.patch
28− ];
23+ patches = [ ./cross.patch ];
2924
3025 # fails 1 out of 1 tests with
3126 # "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed"
pkgs/development/libraries/libcbor/default.nix+2
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
1616
1717 doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error
1818
19+ cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];
20+
1921 NIX_CFLAGS_COMPILE = "-fno-lto";
2022
2123 meta = with stdenv.lib; {
pkgs/development/libraries/libfido2/default.nix+8
@@ -22,6 +22,14 @@ stdenv.mkDerivation rec {
2222 buildInputs = [ hidapi libcbor openssl ]
2323 ++ stdenv.lib.optionals stdenv.isLinux [ udev ];
2424
25+ patches = [
26+ # make build reproducible
27+ (fetchpatch {
28+ url = "https://github.com/Yubico/libfido2/commit/e79f7d7996e70d6b2ae9826fce81d61659cab4f6.patch";
29+ sha256 = "0jwg69f95qqf0ym24q1ka50d3d3338cyw4fdfzpw4sab0shiaq9v";
30+ })
31+ ];
32+
2533 cmakeFlags = [
2634 "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d"
2735 "-DUSE_HIDAPI=1"
pkgs/development/libraries/libglvnd/default.nix+2−18
@@ -2,34 +2,18 @@
22
33stdenv.mkDerivation rec {
44 pname = "libglvnd";
5− version = "1.2.0";
5+ version = "1.3.1";
66
77 src = fetchFromGitHub {
88 owner = "NVIDIA";
99 repo = "libglvnd";
1010 rev = "v${version}";
11− sha256 = "1hyywwjsmvsd7di603f7iznjlccqlc7yvz0j59gax7bljm9wb6ni";
11+ sha256 = "0mkzdzdxjxjl794rblq4mq33wmb8ikqmfswbqdbr8gw2kw4wlhdl";
1212 };
1313
1414 nativeBuildInputs = [ autoreconfHook pkgconfig python3 addOpenGLRunpath ];
1515 buildInputs = [ libX11 libXext xorgproto ];
1616
17− # The following 3 patches should be removed once libglvnd >1.2.0 is released
18− patches = [
19− (fetchpatch {
20− url = "https://github.com/NVIDIA/libglvnd/commit/6f52473dac08c44b081b792874b4ce73122096da.patch";
21− sha256 = "0rd9ihl8n33cm0rya5a7ki0hn31fh52r0gaj5d4w80jrsah2ayij";
22− })
23− (fetchpatch {
24− url = "https://github.com/NVIDIA/libglvnd/commit/51233cc52cbcbe25f8461830913c06f5b5bc9508.patch";
25− sha256 = "1qx3nw8vq5xcrixmi7xw1vpy4gbf7kmx38rx8wg8x046g4mv8ijj";
26− })
27− (fetchpatch {
28− url = "https://github.com/NVIDIA/libglvnd/commit/5dfdc5a6dc60a3bdc63cd4510dabacba388da13a.patch";
29− sha256 = "0gmb3619yz3z7n22afjh8p2y13bmsky4r0z0csm14is3wvdi64ya";
30− })
31− ];
32−
3317 postPatch = lib.optionalString stdenv.isDarwin ''
3418 substituteInPlace src/GLX/Makefile.am \
3519 --replace "-Wl,-Bsymbolic " ""
pkgs/development/libraries/libssh/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "libssh";
5− version = "0.8.8";
5+ version = "0.8.9";
66
77 src = fetchurl {
88 url = "https://www.libssh.org/files/0.8/${pname}-${version}.tar.xz";
9− sha256 = "1qk5bm9r6199jbfk54f8w24vkl52051g8s3kmq4z2kdc6vbpy4jb";
9+ sha256 = "09b8w9m5qiap8wbvz4613nglsynpk8hn0q9b929ny2y4l2fy2nc5";
1010 };
1111
1212 postPatch = ''
pkgs/development/libraries/libvorbis/default.nix+3−3
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
1212
1313 patches = [
1414 (fetchpatch {
15− url = "https://gitlab.xiph.org/xiph/vorbis/uploads/a68cf70fa10c8081a633f77b5c6576b7/0001-CVE-2017-14160-make-sure-we-don-t-overflow.patch";
16− sha256 = "0v21p59cb3z77ch1v6q5dcrd733h91f3m8ifnd7kkkr8gzn17d5x";
15+ url = "https://gitlab.xiph.org/xiph/vorbis/commit/018ca26dece618457dd13585cad52941193c4a25.patch";
16+ sha256 = "18k4vp0nmrxxpis641ylnw6dgwxrymh5bf74njr6v8dizmmz1bkj";
1717 name = "CVE-2017-14160+CVE-2018-10393.patch";
1818 })
1919 (fetchpatch {
20− url = "https://gitlab.xiph.org/xiph/vorbis/commit/112d3bd0aaa.diff";
20+ url = "https://gitlab.xiph.org/xiph/vorbis/commit/112d3bd0aaacad51305e1464d4b381dabad0e88b.diff";
2121 sha256 = "1k77y3q36npy8mkkz40f6cb46l2ldrwyrd191m29s8rnbhnafdf7";
2222 name = "CVE-2018-10392.patch";
2323 })
pkgs/development/libraries/nettle/default.nix+2−2
@@ -1,10 +1,10 @@
11{ callPackage, fetchurl, ... } @ args:
22
33callPackage ./generic.nix (args // rec {
4− version = "3.5.1";
4+ version = "3.6";
55
66 src = fetchurl {
77 url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
8− sha256 = "06clvkdfxhlbagn4afssylmn5vrak59dlmnvy8b2xc31hycs3k3m";
8+ sha256 = "1wg3sprl0bzy49cmbwwm91vw67hk1x5i3ksdygsciyxz587hsk6j";
99 };
1010})
pkgs/development/libraries/opencv/4.x.nix+8−6
@@ -38,20 +38,20 @@
3838assert blas.implementation == "openblas" && lapack.implementation == "openblas";
3939
4040let
41− version = "4.1.2";
41+ version = "4.3.0";
4242
4343 src = fetchFromGitHub {
4444 owner = "opencv";
4545 repo = "opencv";
4646 rev = version;
47− sha256 = "0c98ziwvfrzdzwn52a36d37n5rac8zmxq2jn479bzfaii1bib8xx";
47+ sha256 = "1r9bq9p1x99g2y8jvj9428sgqvljz75dm5vrfsma7hh5wjhz9775";
4848 };
4949
5050 contribSrc = fetchFromGitHub {
5151 owner = "opencv";
5252 repo = "opencv_contrib";
5353 rev = version;
54− sha256 = "10ryyxhggin5dk5glf4ycyrfryqf50f4bs10biv6nxlrrinm2di4";
54+ sha256 = "068b4f95rlryab3mffxs2w6dnbmbhrnpsdgl007rxk4bwnz29y49";
5555 };
5656
5757 # Contrib must be built in order to enable Tesseract support:
@@ -62,8 +62,8 @@ let
6262 src = fetchFromGitHub {
6363 owner = "opencv";
6464 repo = "opencv_3rdparty";
65− rev = "32e315a5b106a7b89dbed51c28f8120a48b368b4";
66− sha256 = "19w9f0r16072s59diqxsr5q6nmwyz9gnxjs49nglzhd66p3ddbkp";
65+ rev = "a56b6ac6f030c312b2dce17430eef13aed9af274";
66+ sha256 = "1msbkc3zixx61rcg6a04i1bcfhw1phgsrh93glq1n80hgsk3nbjq";
6767 } + "/ippicv";
6868 files = let name = platform : "ippicv_2019_${platform}_general_20180723.tgz"; in
6969 if stdenv.hostPlatform.system == "x86_64-linux" then
@@ -168,7 +168,9 @@ stdenv.mkDerivation {
168168 # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
169169 # what appears to be some stray headers in dnn/misc/tensorflow
170170 # in contrib when generating the Python bindings:
171− patches = lib.optional enableCuda ./cuda_opt_flow.patch;
171+ patches = [
172+ ./cmake-don-t-use-OpenCVFindOpenEXR.patch
173+ ] ++ lib.optional enableCuda ./cuda_opt_flow.patch;
172174 postPatch = ''
173175 sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt
174176 sed -i -e 's|if len(decls) == 0:|if len(decls) == 0 or "opencv2/" not in hdr:|' ./modules/python/src2/gen2.py
pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patchnew file+55
@@ -0,0 +1,55 @@
1+From 6d988c08e852379a163ecd20df8639196d84d014 Mon Sep 17 00:00:00 2001
2+From: Bernardo Meurer <meurerbernardo@gmail.com>
3+Date: Sun, 26 Apr 2020 14:50:25 -0700
4+Subject: [PATCH] cmake: don't use OpenCVFindOpenEXR
5+
6+Use find_package for this.
7+---
8+ CMakeLists.txt | 2 ++
9+ cmake/OpenCVFindLibsGrfmt.cmake | 15 +++------------
10+ 2 files changed, 5 insertions(+), 12 deletions(-)
11+
12+diff --git a/CMakeLists.txt b/CMakeLists.txt
13+index 4c0b3880fc..0360469350 100644
14+--- a/CMakeLists.txt
15++++ b/CMakeLists.txt
16+@@ -14,6 +14,8 @@ FATAL: In-source builds are not allowed.
17+ ")
18+ endif()
19+
20++# the future!
21++include(FindPkgConfig)
22+
23+ include(cmake/OpenCVMinDepVersions.cmake)
24+
25+diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
26+index 0beaf19317..4c5e46e615 100644
27+--- a/cmake/OpenCVFindLibsGrfmt.cmake
28++++ b/cmake/OpenCVFindLibsGrfmt.cmake
29+@@ -227,20 +227,11 @@ endif()
30+ # --- OpenEXR (optional) ---
31+ if(WITH_OPENEXR)
32+ ocv_clear_vars(HAVE_OPENEXR)
33+- if(NOT BUILD_OPENEXR)
34+- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake")
35+- endif()
36+-
37++ pkg_check_modules(OPENEXR OpenEXR)
38+ if(OPENEXR_FOUND)
39+ set(HAVE_OPENEXR YES)
40+- else()
41+- ocv_clear_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION)
42+-
43+- set(OPENEXR_LIBRARIES IlmImf)
44+- add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/openexr")
45+- if(OPENEXR_VERSION) # check via TARGET doesn't work
46+- set(HAVE_OPENEXR YES)
47+- endif()
48++ set(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_DIRS})
49++ set(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES})
50+ endif()
51+ endif()
52+
53+--
54+2.26.1
55+
pkgs/development/libraries/openexr/default.nix+11−34
@@ -1,11 +1,13 @@
1−{ lib, stdenv, buildPackages, fetchFromGitHub, autoconf, automake, libtool, pkgconfig,
2− zlib, ilmbase, fetchpatch }:
3−
4−let
5− # Doesn't really do anything when not crosscompiling
6− emulator = stdenv.hostPlatform.emulator buildPackages;
7−in
8−
1+{ lib
2+, stdenv
3+, buildPackages
4+, fetchFromGitHub
5+, zlib
6+, ilmbase
7+, fetchpatch
8+, cmake
9+, libtool
10+}:
911stdenv.mkDerivation rec {
1012 pname = "openexr";
1113 version = "2.4.1";
@@ -17,36 +19,11 @@ stdenv.mkDerivation rec {
1719 sha256 = "020gyl8zv83ag6gbcchmqiyx9rh2jca7j8n52zx1gk4rck7kwc01";
1820 };
1921
20− sourceRoot = "source/OpenEXR";
21−
2222 outputs = [ "bin" "dev" "out" "doc" ];
23−
24− # Needed because there are some generated sources. Solution: just run them under QEMU.
25− postPatch = ''
26− for file in b44ExpLogTable dwaLookups
27− do
28− # Ecape for both sh and Automake
29− emu=${lib.escapeShellArg (lib.replaceStrings ["$"] ["$$"] emulator)}
30− before="./$file > $file.h"
31− after="$emu $before"
32− substituteInPlace IlmImf/Makefile.am \
33− --replace "$before" "$after"
34− done
35−
36− # Make sure the patch succeeded
37− [[ $(grep "$emu" IlmImf/Makefile.am | wc -l) = 2 ]]
38− '';
39−
40− preConfigure = ''
41− patchShebangs ./bootstrap
42− ./bootstrap
43− '';
44−
45− nativeBuildInputs = [ pkgconfig autoconf automake libtool ];
23+ nativeBuildInputs = [ cmake libtool ];
4624 propagatedBuildInputs = [ ilmbase zlib ];
4725
4826 enableParallelBuilding = true;
49− doCheck = false; # fails 1 of 1 tests
5027
5128 meta = with stdenv.lib; {
5229 description = "A high dynamic-range (HDR) image file format";
pkgs/development/libraries/science/math/openblas/default.nix+2−2
@@ -96,12 +96,12 @@ let
9696in
9797stdenv.mkDerivation rec {
9898 pname = "openblas";
99− version = "0.3.8";
99+ version = "0.3.9";
100100 src = fetchFromGitHub {
101101 owner = "xianyi";
102102 repo = "OpenBLAS";
103103 rev = "v${version}";
104− sha256 = "0s017qqi4n6jzrxl9cyx625wj26smnyn5g8s699s7h8v1srlrw6p";
104+ sha256 = "0nq51j45shb32n6086xff3x374kx5qhr2cwjzvppx4s2z0ahflal";
105105 };
106106
107107 inherit blas64;
pkgs/development/python-modules/certifi/default.nix+6−2
@@ -5,13 +5,17 @@
55
66buildPythonPackage rec {
77 pname = "certifi";
8− version = "2019.11.28";
8+ version = "2020.4.5.1";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f";
12+ sha256 = "06b5gfs7wmmipln8f3z928d2mmx2j4b3x7pnqmj6cvmyfh8v7z2i";
1313 };
1414
15+ pythonImportsCheck = [ "certifi" ];
16+
17+ dontUseSetuptoolsCheck = true;
18+
1519 meta = {
1620 homepage = "https://certifi.io/";
1721 description = "Python package for providing Mozilla's CA Bundle";
pkgs/development/python-modules/dask/default.nix+10−7
@@ -3,7 +3,7 @@
33, buildPythonPackage
44, fetchFromGitHub
55, fsspec
6−, pytest
6+, pytestCheckHook
77, pythonOlder
88, cloudpickle
99, numpy
@@ -15,7 +15,7 @@
1515
1616buildPythonPackage rec {
1717 pname = "dask";
18− version = "2.10.1";
18+ version = "2.14.0";
1919
2020 disabled = pythonOlder "3.5";
2121
@@ -23,13 +23,15 @@ buildPythonPackage rec {
2323 owner = "dask";
2424 repo = pname;
2525 rev = version;
26− sha256 = "035mr7385yf5ng5wf60qxr80529h8dsla5hymkyg68dxhkd0jvbr";
26+ sha256 = "0kj46pwzvdw8ii1h45y48wxvjid89yp4cfak2h4b8z8xic73fqgj";
2727 };
2828
2929 checkInputs = [
30− pytest
30+ pytestCheckHook
3131 ];
3232
33+ dontUseSetuptoolsCheck = true;
34+
3335 propagatedBuildInputs = [
3436 bokeh
3537 cloudpickle
@@ -50,9 +52,10 @@ buildPythonPackage rec {
5052 --replace "cmdclass=versioneer.get_cmdclass()," ""
5153 '';
5254
53− checkPhase = ''
54− pytest
55− '';
55+ disabledTests = [
56+ "test_argwhere_str"
57+ "test_count_nonzero_str"
58+ ];
5659
5760 meta = {
5861 description = "Minimal task scheduling abstraction";
pkgs/development/python-modules/ipython/default.nix+2−2
@@ -22,12 +22,12 @@
2222
2323buildPythonPackage rec {
2424 pname = "ipython";
25− version = "7.12.0";
25+ version = "7.13.0";
2626 disabled = pythonOlder "3.6";
2727
2828 src = fetchPypi {
2929 inherit pname version;
30− sha256 = "d9459e7237e2e5858738ff9c3e26504b79899b58a6d49e574d352493d80684c6";
30+ sha256 = "ca478e52ae1f88da0102360e57e528b92f3ae4316aabac80a2cd7f7ab2efb48a";
3131 };
3232
3333 prePatch = lib.optionalString stdenv.isDarwin ''
pkgs/development/python-modules/jupyter_client/default.nix+2−2
@@ -12,11 +12,11 @@
1212
1313buildPythonPackage rec {
1414 pname = "jupyter_client";
15− version = "5.3.4";
15+ version = "6.1.3";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "60e6faec1031d63df57f1cc671ed673dced0ed420f4377ea33db37b1c188b910";
19+ sha256 = "3a32fa4d0b16d1c626b30c3002a62dfd86d6863ed39eaba3f537fade197bb756";
2020 };
2121
2222 propagatedBuildInputs = [
pkgs/development/python-modules/jupyter_core/default.nix+2−2
@@ -11,11 +11,11 @@
1111
1212buildPythonPackage rec {
1313 pname = "jupyter_core";
14− version = "4.6.1";
14+ version = "4.6.3";
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "a183e0ec2e8f6adddf62b0a3fc6a2237e3e0056d381e536d3e7c7ecc3067e244";
18+ sha256 = "394fd5dd787e7c8861741880bdf8a00ce39f95de5d18e579c74b882522219e7e";
1919 };
2020
2121 checkInputs = [ pytest mock glibcLocales nose ];
pkgs/development/python-modules/line_profiler/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "line_profiler";
12− version = "2.1.2";
12+ version = "3.0.2";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "efa66e9e3045aa7cb1dd4bf0106e07dec9f80bc781a993fbaf8162a36c20af5c";
16+ sha256 = "7218ad6bd81f8649b211974bf108933910f016d66b49651effe7bbf63667d141";
1717 };
1818
1919 patches = [ ./python37.patch ];
pkgs/development/python-modules/nbformat/2.nix+2−2
@@ -12,11 +12,11 @@
1212
1313buildPythonPackage rec {
1414 pname = "nbformat";
15− version = "4.4.0";
15+ version = "5.0.4";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "f7494ef0df60766b7cabe0a3651556345a963b74dbc16bc7c18479041170d402";
19+ sha256 = "562de41fc7f4f481b79ab5d683279bf3a168858268d4387b489b7b02be0b324a";
2020 };
2121
2222 LC_ALL="en_US.utf8";
pkgs/development/python-modules/nbformat/default.nix+2−2
@@ -12,11 +12,11 @@
1212
1313buildPythonPackage rec {
1414 pname = "nbformat";
15− version = "5.0.4";
15+ version = "5.0.6";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "562de41fc7f4f481b79ab5d683279bf3a168858268d4387b489b7b02be0b324a";
19+ sha256 = "049af048ed76b95c3c44043620c17e56bc001329e07f83fec4f177f0e3d7b757";
2020 };
2121
2222 LC_ALL="en_US.utf8";
pkgs/development/python-modules/notebook/2.nix+2−2
@@ -25,11 +25,11 @@
2525
2626buildPythonPackage rec {
2727 pname = "notebook";
28− version = "5.7.8";
28+ version = "6.0.3";
2929
3030 src = fetchPypi {
3131 inherit pname version;
32− sha256 = "573e0ae650c5d76b18b6e564ba6d21bf321d00847de1d215b418acb64f056eb8";
32+ sha256 = "47a9092975c9e7965ada00b9a20f0cf637d001db60d241d479f53c0be117ad48";
3333 };
3434
3535 LC_ALL = "en_US.utf8";
pkgs/development/python-modules/numpy/default.nix+2−2
@@ -27,13 +27,13 @@ let
2727 };
2828in buildPythonPackage rec {
2929 pname = "numpy";
30− version = "1.18.1";
30+ version = "1.18.3";
3131 format = "pyproject.toml";
3232
3333 src = fetchPypi {
3434 inherit pname version;
3535 extension = "zip";
36− sha256 = "b6ff59cee96b454516e47e7721098e6ceebef435e3e21ac2d6c3b8b02628eb77";
36+ sha256 = "e46e2384209c91996d5ec16744234d1c906ab79a701ce1a26155c9ec890b8dc8";
3737 };
3838
3939 nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ];
pkgs/development/python-modules/qtconsole/default.nix+2−2
@@ -14,11 +14,11 @@
1414
1515buildPythonPackage rec {
1616 pname = "qtconsole";
17− version = "4.6.0";
17+ version = "4.7.3";
1818
1919 src = fetchPypi {
2020 inherit pname version;
21− sha256 = "654f423662e7dfe6a9b26fac8ec76aedcf742c339909ac49f1f0c1a1b744bcd1";
21+ sha256 = "8f5ae5571f0e921db9f2d12613ed667c350ee22c7db598d9bbbe143e8533f932";
2222 };
2323
2424 checkInputs = [ nose ] ++ lib.optionals isPy27 [mock];
pkgs/development/python-modules/reikna/default.nix+2−2
@@ -13,11 +13,11 @@
1313
1414buildPythonPackage rec {
1515 pname = "reikna";
16− version = "0.7.4";
16+ version = "0.7.5";
1717
1818 src = fetchPypi {
1919 inherit pname version;
20− sha256 = "52bbce24fa1fd7bb950d38ce9b60f497dd00ac6b26688d80ab9bce709f063e71";
20+ sha256 = "d01f4264c8379ef2962a93aacb002d491b92ef9b5b22b45f77e7821dfa87bef7";
2121 };
2222
2323 checkInputs = [ sphinx pytestcov pytest ];
pkgs/development/python-modules/sounddevice/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "sounddevice";
12− version = "0.3.14";
12+ version = "0.3.15";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "c7b0f7ad86550668da55404eabcb63d4212ec622fcce86510092306b77d2e80a";
16+ sha256 = "028f6e5df83027f4bfba5d6d61e6d46eb8689f9e647825e09f539920dee17d2c";
1717 };
1818
1919 propagatedBuildInputs = [ cffi numpy portaudio ];
pkgs/development/python-modules/statsmodels/default.nix+2−2
@@ -13,11 +13,11 @@
1313
1414buildPythonPackage rec {
1515 pname = "statsmodels";
16− version = "0.11.0";
16+ version = "0.11.1";
1717
1818 src = fetchPypi {
1919 inherit pname version;
20− sha256 = "0wcc7xbwlf8r2diw9fnzf4bg9h5cg406w7phd3dz37hx17yfi3ha";
20+ sha256 = "5bde3fa0a35a91b45dba7cbc28270b5b649ff1d721c89290883f6e831672d5f0";
2121 };
2222
2323 checkInputs = with self; [ nose ];
pkgs/development/python-modules/tabulate/default.nix+2−2
@@ -5,12 +5,12 @@
55}:
66
77buildPythonPackage rec {
8− version = "0.8.6";
8+ version = "0.8.7";
99 pname = "tabulate";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "5470cc6687a091c7042cee89b2946d9235fe9f6d49c193a4ae2ac7bf386737c8";
13+ sha256 = "db2723a20d04bcda8522165c73eea7c300eda74e0ce852d9022e0159d7895007";
1414 };
1515
1616 checkInputs = [ nose ];
pkgs/development/python-modules/tqdm/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "tqdm";
12− version = "4.42.1";
12+ version = "4.45.0";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "251ee8440dbda126b8dfa8a7c028eb3f13704898caaef7caa699b35e119301e2";
16+ sha256 = "00339634a22c10a7a22476ee946bbde2dbe48d042ded784e4d88e0236eca5d81";
1717 };
1818
1919 checkInputs = [ nose coverage glibcLocales flake8 ];
pkgs/development/python-modules/xarray/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "xarray";
13− version = "0.15.0";
13+ version = "0.15.1";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "c72d160c970725201f769e80fb91cbad68d6ebf21d68fcc371385a6c950459c3";
17+ sha256 = "64e3138d87b641e22fe7a003c94abc685896b247b63e434505c1e6b38c91a8fb";
1818 };
1919
2020 checkInputs = [ pytest ];
pkgs/development/tools/build-managers/meson/default.nix+9−35
@@ -3,20 +3,9 @@
33, stdenv
44, writeTextDir
55, substituteAll
6−, targetPackages
6+, pkgsHostHost
77}:
88
9−let
10− # See https://mesonbuild.com/Reference-tables.html#cpu-families
11− cpuFamilies = {
12− aarch64 = "aarch64";
13− armv5tel = "arm";
14− armv6l = "arm";
15− armv7l = "arm";
16− i686 = "x86";
17− x86_64 = "x86_64";
18− };
19−in
209python3Packages.buildPythonApplication rec {
2110 pname = "meson";
2211 version = "0.54.0";
@@ -45,6 +34,11 @@ python3Packages.buildPythonApplication rec {
4534 # We remove the check so multiple outputs can work sanely.
4635 ./allow-dirs-outside-of-prefix.patch
4736
37+ # Meson is currently inspecting fewer variables than autoconf does, which
38+ # makes it harder for us to use setup hooks, etc. Taken from
39+ # https://github.com/mesonbuild/meson/pull/6827
40+ ./more-env-vars.patch
41+
4842 # Unlike libtool, vanilla Meson does not pass any information
4943 # about the path library will be installed to to g-ir-scanner,
5044 # breaking the GIR when path other than ${!outputLib}/lib is used.
@@ -65,35 +59,15 @@ python3Packages.buildPythonApplication rec {
6559
6660 setupHook = ./setup-hook.sh;
6761
68− crossFile = writeTextDir "cross-file.conf" ''
69− [binaries]
70− c = '${targetPackages.stdenv.cc.targetPrefix}cc'
71− cpp = '${targetPackages.stdenv.cc.targetPrefix}c++'
72− ar = '${targetPackages.stdenv.cc.bintools.targetPrefix}ar'
73− strip = '${targetPackages.stdenv.cc.bintools.targetPrefix}strip'
74− pkgconfig = 'pkg-config'
75− ld = '${targetPackages.stdenv.cc.targetPrefix}ld'
76− objcopy = '${targetPackages.stdenv.cc.targetPrefix}objcopy'
77−
78− [properties]
79− needs_exe_wrapper = true
80−
81− [host_machine]
82− system = '${targetPackages.stdenv.targetPlatform.parsed.kernel.name}'
83− cpu_family = '${cpuFamilies.${targetPackages.stdenv.targetPlatform.parsed.cpu.name}}'
84− cpu = '${targetPackages.stdenv.targetPlatform.parsed.cpu.name}'
85− endian = ${if targetPackages.stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"}
86− '';
62+ # Ensure there will always be a native C compiler when meson is used, as a
63+ # workaround until https://github.com/mesonbuild/meson/pull/6512 lands.
64+ depsHostHostPropagated = [ pkgsHostHost.stdenv.cc ];
8765
8866 # 0.45 update enabled tests but they are failing
8967 doCheck = false;
9068 # checkInputs = [ ninja pkgconfig ];
9169 # checkPhase = "python ./run_project_tests.py";
9270
93− inherit (stdenv) cc;
94−
95− isCross = stdenv.targetPlatform != stdenv.hostPlatform;
96−
9771 meta = with lib; {
9872 homepage = "https://mesonbuild.com";
9973 description = "SCons-like build system that use python as a front-end language and Ninja as a building backend";
pkgs/development/tools/build-managers/meson/more-env-vars.patchnew file+16
@@ -0,0 +1,16 @@
1+diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
2+index ac13a710..e0d07c51 100644
3+--- a/mesonbuild/envconfig.py
4++++ b/mesonbuild/envconfig.py
5+@@ -119,9 +119,9 @@ def get_env_var_pair(for_machine: MachineChoice,
6+ # compiling we fall back on the unprefixed host version. This
7+ # allows native builds to never need to worry about the 'BUILD_*'
8+ # ones.
9+- ([var_name + '_FOR_BUILD'] if is_cross else [var_name]),
10++ [var_name + '_FOR_BUILD'] + ([] if is_cross else [var_name]),
11+ # Always just the unprefixed host verions
12+- ([] if is_cross else [var_name]),
13++ [var_name],
14+ )[for_machine]
15+ for var in candidates:
16+ value = os.environ.get(var)
pkgs/development/tools/build-managers/meson/setup-hook.sh+1−6
@@ -5,11 +5,6 @@ mesonConfigurePhase() {
55 mesonFlags="--prefix=$prefix $mesonFlags"
66 fi
77
8− # Build release by default.
9− if [ -n "@isCross@" ]; then
10− crossMesonFlags="--cross-file=@crossFile@/cross-file.conf"
11− fi
12−
138 # See multiple-outputs.sh and meson’s coredata.py
149 mesonFlags="\
1510 --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \
@@ -25,7 +20,7 @@ mesonConfigurePhase() {
2520
2621 echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}"
2722
28− CC=@cc@/bin/cc CXX=@cc@/bin/c++ meson build $mesonFlags "${mesonFlagsArray[@]}"
23+ meson build $mesonFlags "${mesonFlagsArray[@]}"
2924 cd build
3025
3126 if ! [[ -v enableParallelBuilding ]]; then
pkgs/development/tools/buildah/default.nix+2−2
@@ -22,7 +22,7 @@ buildGoPackage rec {
2222 sha256 = "187cvb3i5cwm7cwxmzpl2ca7900yb6v6b6cybyz5mnd5ccy5ff1q";
2323 };
2424
25− outputs = [ "bin" "man" "out" ];
25+ outputs = [ "out" "man" ];
2626
2727 goPackagePath = "github.com/containers/buildah";
2828 excludedPackages = [ "tests" ];
@@ -35,7 +35,7 @@ buildGoPackage rec {
3535 buildPhase = ''
3636 pushd go/src/${goPackagePath}
3737 make GIT_COMMIT="unknown"
38− install -Dm755 buildah $bin/bin/buildah
38+ install -Dm755 buildah $out/bin/buildah
3939 installShellCompletion --bash contrib/completions/bash/buildah
4040 '';
4141
pkgs/development/tools/cloudfoundry-cli/default.nix+1−1
@@ -34,7 +34,7 @@ buildGoPackage rec {
3434 '';
3535
3636 installPhase = ''
37− install -Dm555 out/cf "$bin/bin/cf"
37+ install -Dm555 out/cf "$out/bin/cf"
3838 installShellCompletion --bash "$src/ci/installers/completion/cf"
3939 '';
4040
pkgs/development/tools/container-linux-config-transpiler/default.nix+2−2
@@ -20,8 +20,8 @@ buildGoPackage rec {
2020 '';
2121
2222 postInstall = ''
23− mv $bin/bin/{internal,ct}
24− rm $bin/bin/tools
23+ mv $out/bin/{internal,ct}
24+ rm $out/bin/tools
2525 '';
2626
2727 meta = {
pkgs/development/tools/continuous-integration/buildkite-agent/default.nix+2−2
@@ -24,10 +24,10 @@ buildGoPackage rec {
2424
2525 postInstall = ''
2626 # Fix binary name
27− mv $bin/bin/{agent,buildkite-agent}
27+ mv $out/bin/{agent,buildkite-agent}
2828
2929 # These are runtime dependencies
30− wrapProgram $bin/bin/buildkite-agent \
30+ wrapProgram $out/bin/buildkite-agent \
3131 --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}'
3232 '';
3333
pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix+6−6
@@ -15,17 +15,17 @@ buildGoPackage {
1515 postInstall = ''
1616 ${stdenv.lib.optionalString hasBootstrapScript ''
1717 # Install bootstrap.sh
18− mkdir -p $bin/libexec/buildkite-agent
19− cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $bin/libexec/buildkite-agent
20− sed -e "s|#!/bin/bash|#!${bash}/bin/bash|g" -i $bin/libexec/buildkite-agent/bootstrap.sh
18+ mkdir -p $out/libexec/buildkite-agent
19+ cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $out/libexec/buildkite-agent
20+ sed -e "s|#!/bin/bash|#!${bash}/bin/bash|g" -i $out/libexec/buildkite-agent/bootstrap.sh
2121 ''}
2222
2323 # Fix binary name
24− mv $bin/bin/{agent,buildkite-agent}
24+ mv $out/bin/{agent,buildkite-agent}
2525
2626 # These are runtime dependencies
27− wrapProgram $bin/bin/buildkite-agent \
28− ${stdenv.lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $bin/libexec/buildkite-agent/bootstrap.sh"} \
27+ wrapProgram $out/bin/buildkite-agent \
28+ ${stdenv.lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $out/libexec/buildkite-agent/bootstrap.sh"} \
2929 --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}'
3030 '';
3131
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix+4−4
@@ -35,10 +35,10 @@ buildGoPackage rec {
3535 patches = [ ./fix-shell-path.patch ];
3636
3737 postInstall = ''
38− touch $bin/bin/hello
39− install -d $bin/bin/helper-images
40− ln -sf ${docker_x86_64} $bin/bin/helper-images/prebuilt-x86_64.tar.xz
41− ln -sf ${docker_arm} $bin/bin/helper-images/prebuilt-arm.tar.xz
38+ touch $out/bin/hello
39+ install -d $out/bin/helper-images
40+ ln -sf ${docker_x86_64} $out/bin/helper-images/prebuilt-x86_64.tar.xz
41+ ln -sf ${docker_arm} $out/bin/helper-images/prebuilt-arm.tar.xz
4242 '';
4343
4444 meta = with lib; {
pkgs/development/tools/deis/default.nix+2−2
@@ -9,8 +9,8 @@ buildGoPackage rec {
99 subPackages = [ "client" ];
1010
1111 postInstall = ''
12− if [ -f "$bin/bin/client" ]; then
13− mv "$bin/bin/client" "$bin/bin/deis"
12+ if [ -f "$out/bin/client" ]; then
13+ mv "$out/bin/client" "$out/bin/deis"
1414 fi
1515 '';
1616
pkgs/development/tools/dep2nix/default.nix+1−1
@@ -19,7 +19,7 @@ buildGoPackage rec {
1919 ];
2020
2121 postFixup = ''
22− wrapProgram $bin/bin/dep2nix \
22+ wrapProgram $out/bin/dep2nix \
2323 --prefix PATH : ${nix-prefetch-scripts}/bin
2424 '';
2525
pkgs/development/tools/doctl/default.nix+1−1
@@ -21,7 +21,7 @@ buildGoPackage rec {
2121 postInstall = ''
2222 export HOME=$(mktemp -d) # attempts to write to /homeless-shelter
2323 for shell in bash fish zsh; do
24− $bin/bin/doctl completion $shell > doctl.$shell
24+ $out/bin/doctl completion $shell > doctl.$shell
2525 installShellCompletion doctl.$shell
2626 done
2727 '';
pkgs/development/tools/fac/default.nix+1−1
@@ -18,7 +18,7 @@ buildGoPackage rec {
1818 nativeBuildInputs = [ makeWrapper ];
1919
2020 postInstall = ''
21− wrapProgram $bin/bin/fac \
21+ wrapProgram $out/bin/fac \
2222 --prefix PATH : ${git}/bin
2323
2424 # Install man page, not installed by default
pkgs/development/tools/go2nix/default.nix+2−2
@@ -17,14 +17,14 @@ buildGoPackage rec {
1717
1818 goDeps = ./deps.nix;
1919
20− outputs = [ "bin" "out" "man" ];
20+ outputs = [ "out" "man" ];
2121
2222 nativeBuildInputs = [ go-bindata gotools makeWrapper ];
2323
2424 preBuild = ''go generate ./...'';
2525
2626 postInstall = ''
27− wrapProgram $bin/bin/go2nix \
27+ wrapProgram $out/bin/go2nix \
2828 --prefix PATH : ${nix-prefetch-git}/bin \
2929 --prefix PATH : ${git}/bin
3030
pkgs/development/tools/gocode-gomod/default.nix+1−1
@@ -25,7 +25,7 @@ buildGoPackage rec {
2525 goDeps = ./deps.nix;
2626
2727 postInstall = ''
28− mv $bin/bin/gocode $bin/bin/gocode-gomod
28+ mv $out/bin/gocode $out/bin/gocode-gomod
2929 '';
3030
3131 meta = with stdenv.lib; {
pkgs/development/tools/kind/default.nix+1−1
@@ -20,7 +20,7 @@ buildGoPackage rec {
2020 nativeBuildInputs = [ installShellFiles ];
2121 postInstall = ''
2222 for shell in bash zsh; do
23− $bin/bin/kind completion $shell > kind.$shell
23+ $out/bin/kind completion $shell > kind.$shell
2424 installShellCompletion kind.$shell
2525 done
2626 '';
pkgs/development/tools/misc/hound/default.nix+1−1
@@ -27,7 +27,7 @@ buildGoPackage rec {
2727 postInstall = with stdenv; let
2828 binPath = lib.makeBinPath [ mercurial git ];
2929 in ''
30− wrapProgram $bin/bin/houndd --prefix PATH : ${binPath}
30+ wrapProgram $out/bin/houndd --prefix PATH : ${binPath}
3131 '';
3232
3333 meta = {
pkgs/development/tools/out-of-tree/default.nix+1−1
@@ -17,7 +17,7 @@ buildGoPackage rec {
1717 goDeps = ./deps.nix;
1818
1919 postFixup = ''
20− wrapProgram $bin/bin/out-of-tree \
20+ wrapProgram $out/bin/out-of-tree \
2121 --prefix PATH : "${stdenv.lib.makeBinPath [ qemu docker which ]}"
2222 '';
2323
pkgs/development/tools/pandoc/default.nixnew file+29
@@ -0,0 +1,29 @@
1+{ haskellPackages, haskell, removeReferencesTo }:
2+
3+let
4+ static = haskell.lib.justStaticExecutables haskellPackages.pandoc;
5+
6+in
7+ (haskell.lib.overrideCabal static (drv: {
8+ configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"];
9+ buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed];
10+ buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ];
11+ })).overrideAttrs (drv: {
12+
13+ # These libraries are still referenced, because pandoc references
14+ # their `Paths_*` module for figuring out their version.
15+ # The `Paths_*` module is generated by Cabal, and contains the
16+ # version, but also paths to e.g. the data directories, which
17+ # lead to a transitive runtime dependency on the whole GHC distribution.
18+ # This should ideally be fixed in haskellPackages (or even Cabal),
19+ # but a minimal pandoc is important enough to patch it manually.
20+ disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.HTTP ];
21+ postInstall = ''
22+ remove-references-to \
23+ -t ${haskellPackages.pandoc-types} \
24+ $out/bin/pandoc
25+ remove-references-to \
26+ -t ${haskellPackages.HTTP} \
27+ $out/bin/pandoc
28+ '';
29+ })
pkgs/development/tools/parsing/re2c/default.nix+11−3
@@ -1,16 +1,24 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook }:
1+{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:
22
33stdenv.mkDerivation rec {
44 pname = "re2c";
5− version = "1.2.1";
5+ version = "1.3";
66
77 src = fetchFromGitHub {
88 owner = "skvadrik";
99 repo = "re2c";
1010 rev = version;
11− sha256 = "1qj0ck9msb9h8g9qb1lr57jmlj8x68ini3y3ccdifjjahhhr0hd4";
11+ sha256 = "0aqlf2h6i2m3dq11dkq89p4w4c9kp4x66s5rhp84gmpz5xqv1x5h";
1212 };
1313
14+ patches = [
15+ (fetchpatch {
16+ name = "CVE-2020-11958.patch";
17+ url = "https://github.com/skvadrik/re2c/commit/c4603ba5ce229db83a2a4fb93e6d4b4e3ec3776a.patch";
18+ sha256 = "1d95ahxk92g7k87sda9gxgmr3blyfzwd2y7h9jxj8zkd74knd9zh";
19+ })
20+ ];
21+
1422 nativeBuildInputs = [ autoreconfHook ];
1523
1624 doCheck = true;
pkgs/development/tools/skaffold/default.nix+1−1
@@ -26,7 +26,7 @@ buildGoPackage rec {
2626 nativeBuildInputs = [ installShellFiles ];
2727 postInstall = ''
2828 for shell in bash zsh; do
29− $bin/bin/skaffold completion $shell > skaffold.$shell
29+ $out/bin/skaffold completion $shell > skaffold.$shell
3030 installShellCompletion skaffold.$shell
3131 done
3232 '';
pkgs/development/tools/skopeo/default.nix+1−1
@@ -34,7 +34,7 @@ buildGoPackage {
3434 inherit version;
3535 inherit src goPackagePath;
3636
37− outputs = [ "bin" "man" "out" ];
37+ outputs = [ "out" "man" ];
3838
3939 excludedPackages = [ "integration" ];
4040
pkgs/development/tools/toxiproxy/default.nix+2−2
@@ -15,8 +15,8 @@ buildGoPackage rec {
1515 buildFlagsArray = "-ldflags=-X github.com/Shopify/toxiproxy.Version=v${version}";
1616
1717 postInstall = ''
18− mv $bin/bin/cli $bin/bin/toxiproxy-cli
19− mv $bin/bin/cmd $bin/bin/toxiproxy-cmd
18+ mv $out/bin/cli $out/bin/toxiproxy-cli
19+ mv $out/bin/cmd $out/bin/toxiproxy-cmd
2020 '';
2121
2222 meta = {
pkgs/development/tools/vgo2nix/default.nix+1−1
@@ -28,7 +28,7 @@ buildGoPackage {
2828 postInstall = with stdenv; let
2929 binPath = lib.makeBinPath [ nix-prefetch-git go ];
3030 in ''
31− wrapProgram $bin/bin/vgo2nix --prefix PATH : ${binPath}
31+ wrapProgram $out/bin/vgo2nix --prefix PATH : ${binPath}
3232 '';
3333
3434 meta = with stdenv.lib; {
pkgs/development/tools/wally-cli/default.nix+1−1
@@ -19,7 +19,7 @@ buildGoPackage rec {
1919 };
2020
2121 postInstall = ''
22− mv $bin/bin/cli $bin/bin/wally
22+ mv $out/bin/cli $out/bin/wally
2323 '';
2424
2525 goDeps = ./deps.nix;
pkgs/development/tools/xcbuild/wrapper.nix+4
@@ -110,11 +110,15 @@ runCommand "xcodebuild-${xcbuild.version}" {
110110 mkdir -p $out/Applications/Xcode.app/Contents
111111 ln -s $out $out/Applications/Xcode.app/Contents/Developer
112112
113+ # The native xcodebuild command supports an invocation like "xcodebuild -version -sdk" without specifying the specific SDK, so we simulate this by
114+ # detecting this case and simulating the output; printing the header and appending the normal output via appending the sdk version to the positional
115+ # arguments we pass through to the wrapped xcodebuild.
113116 makeWrapper ${xcbuild}/bin/xcodebuild $out/bin/xcodebuild \
114117 --add-flags "-xcconfig ${xcconfig}" \
115118 --add-flags "DERIVED_DATA_DIR=." \
116119 --set DEVELOPER_DIR "$out" \
117120 --set SDKROOT ${sdkName} \
121+ --run '[ "$#" -eq 2 ] && [ "$1" = "-version" ] && [ "$2" = "-sdk" ] && echo ${sdkName}.sdk - macOS ${sdkVer} \(macosx${sdkVer}\) && set -- "$@" "${sdkName}"' \
118122 --run '[ "$1" = "-version" ] && [ "$#" -eq 1 ] && (echo Xcode ${xcodeVer}; echo Build version ${sdkBuildVersion}) && exit 0' \
119123 --run '[ "$1" = "-license" ] && exit 0'
120124
pkgs/games/boohu/default.nix+1−1
@@ -14,7 +14,7 @@ buildGoPackage rec {
1414
1515 goDeps = ./deps.nix;
1616
17− postInstall = "mv $bin/bin/boohu.git $bin/bin/boohu";
17+ postInstall = "mv $out/bin/boohu.git $out/bin/boohu";
1818
1919 meta = with stdenv.lib; {
2020 description = "A new coffee-break roguelike game";
pkgs/games/harmonist/default.nix+1−1
@@ -14,7 +14,7 @@ buildGoPackage rec {
1414
1515 goDeps = ./deps.nix;
1616
17− postInstall = "mv $bin/bin/harmonist.git $bin/bin/harmonist";
17+ postInstall = "mv $out/bin/harmonist.git $out/bin/harmonist";
1818
1919 meta = with stdenv.lib; {
2020 description = "A stealth coffee-break roguelike game";
pkgs/misc/cups/default.nix+2−2
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 pname = "cups";
3131
3232 # After 2.2.6, CUPS requires headers only available in macOS 10.12+
33− version = if stdenv.isDarwin then "2.2.6" else "2.3.1";
33+ version = if stdenv.isDarwin then "2.2.6" else "2.3.3";
3434
3535 passthru = { inherit version; };
3636
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz";
3939 sha256 = if version == "2.2.6"
4040 then "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20"
41− else "1kkpmj17205j8w9hdff2bfpk6lwdmr3gx0j4r35nhgvya24rvjhv";
41+ else "1vpk0b2vq830f8fvf9z8qjsm5k141i7pi8djbinpnr78pi4dj7r6";
4242 };
4343
4444 outputs = [ "out" "lib" "dev" "man" ];
pkgs/misc/logging/beats/6.x.nix+1−1
@@ -47,7 +47,7 @@ in {
4747 '';
4848 buildInputs = [ systemd.dev ];
4949 postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in ''
50− patchelf --set-rpath ${libPath} "$bin/bin/journalbeat"
50+ patchelf --set-rpath ${libPath} "$out/bin/journalbeat"
5151 '';
5252 };
5353}
pkgs/misc/logging/beats/7.x.nix+1−1
@@ -46,7 +46,7 @@ in {
4646 '';
4747 buildInputs = [ systemd.dev ];
4848 postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in ''
49− patchelf --set-rpath ${libPath} "$bin/bin/journalbeat"
49+ patchelf --set-rpath ${libPath} "$out/bin/journalbeat"
5050 '';
5151 };
5252}
pkgs/os-specific/darwin/binutils/default.nix+8−7
@@ -16,7 +16,7 @@ in
1616stdenv.mkDerivation {
1717 pname = "${targetPrefix}cctools-binutils-darwin";
1818 inherit (cctools) version;
19− outputs = [ "out" "info" "man" ];
19+ outputs = [ "out" "man" ];
2020 buildCommand = ''
2121 mkdir -p $out/bin $out/include
2222
@@ -42,12 +42,13 @@ stdenv.mkDerivation {
4242
4343 ln -s ${cctools}/libexec $out/libexec
4444
45− mkdir -p "$info/nix-support" "$man/nix-support"
46− printWords ${binutils-unwrapped.info} \
47− >> $info/nix-support/propagated-build-inputs
48− # FIXME: cctools missing man pages
49− printWords ${binutils-unwrapped.man} \
50− >> $man/nix-support/propagated-build-inputs
45+ mkdir -p "$man"/share/man/man{1,5}
46+ for i in ${builtins.concatStringsSep " " cmds}; do
47+ for path in "${cctools.man}"/share/man/man?/$i.*; do
48+ dest_path="$man''${path#${cctools.man}}"
49+ ln -sv "$path" "$dest_path"
50+ done
51+ done
5152 '';
5253
5354 passthru = {
pkgs/os-specific/darwin/cctools/port.nix+5−2
@@ -1,4 +1,5 @@
11{ stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook
2+, installShellFiles
23, libcxxabi, libuuid
34, libobjc ? null, maloader ? null
45, enableTapiSupport ? true, libtapi
@@ -28,9 +29,9 @@ let
2829 sha256 = "0h8b1my0wf1jyjq63wbiqkl2clgxsf87f6i4fjhqs431fzlq8sac";
2930 };
3031
31− outputs = [ "out" "dev" ];
32+ outputs = [ "out" "dev" "man" ];
3233
33− nativeBuildInputs = [ autoconf automake libtool autoreconfHook ];
34+ nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ];
3435 buildInputs = [ libuuid ]
3536 ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]
3637 ++ stdenv.lib.optional enableTapiSupport libtapi;
@@ -88,6 +89,8 @@ let
8889 pushd include
8990 make DSTROOT=$out/include RC_OS=common install
9091 popd
92+
93+ installManPage ar/ar.{1,5}
9194 '';
9295
9396 passthru = {
pkgs/os-specific/linux/firmware/sof-firmware/default.nixnew file+28
@@ -0,0 +1,28 @@
1+{ stdenv, fetchurl }:
2+
3+with stdenv.lib;
4+stdenv.mkDerivation rec {
5+ pname = "sof-firmware";
6+ version = "1.4.2";
7+
8+ src = fetchurl {
9+ url = "https://www.alsa-project.org/files/pub/misc/sof/${pname}-${version}.tar.bz2";
10+ sha256 = "1nkh020gjm45vxd6fvmz63hj16ilff2nl5avvsklajjs6xci1sf5";
11+ };
12+
13+ phases = [ "unpackPhase" "installPhase" ];
14+
15+ installPhase = ''
16+ rm lib/firmware/intel/{sof/LICENCE,sof-tplg/LICENCE}
17+ mkdir $out
18+ cp -r lib $out/lib
19+ '';
20+
21+ meta = with stdenv.lib; {
22+ description = "Sound Open Firmware";
23+ homepage = "https://www.sofproject.org/";
24+ license = with licenses; [ bsd3 isc ];
25+ maintainers = with maintainers; [ lblasc ];
26+ platforms = with platforms; linux;
27+ };
28+}
pkgs/os-specific/linux/kernel/common-config.nix+21
@@ -254,6 +254,27 @@ let
254254 SND_USB_CAIAQ_INPUT = yes;
255255 # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
256256 PSS_MIXER = whenOlder "4.12" yes;
257+ # Enable Sound Open Firmware support
258+ } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" &&
259+ versionAtLeast version "5.5") {
260+ SND_SOC_SOF_TOPLEVEL = yes;
261+ SND_SOC_SOF_ACPI = module;
262+ SND_SOC_SOF_PCI = module;
263+ SND_SOC_SOF_APOLLOLAKE_SUPPORT = yes;
264+ SND_SOC_SOF_CANNONLAKE_SUPPORT = yes;
265+ SND_SOC_SOF_COFFEELAKE_SUPPORT = yes;
266+ SND_SOC_SOF_COMETLAKE_H_SUPPORT = yes;
267+ SND_SOC_SOF_COMETLAKE_LP_SUPPORT = yes;
268+ SND_SOC_SOF_ELKHARTLAKE_SUPPORT = yes;
269+ SND_SOC_SOF_GEMINILAKE_SUPPORT = yes;
270+ SND_SOC_SOF_HDA_AUDIO_CODEC = yes;
271+ SND_SOC_SOF_HDA_COMMON_HDMI_CODEC = yes;
272+ SND_SOC_SOF_HDA_LINK = yes;
273+ SND_SOC_SOF_ICELAKE_SUPPORT = yes;
274+ SND_SOC_SOF_INTEL_TOPLEVEL = yes;
275+ SND_SOC_SOF_JASPERLAKE_SUPPORT = yes;
276+ SND_SOC_SOF_MERRIFIELD_SUPPORT = yes;
277+ SND_SOC_SOF_TIGERLAKE_SUPPORT = yes;
257278 };
258279
259280 usb-serial = {
pkgs/os-specific/linux/kernel/manual-config.nix+3−3
@@ -1,6 +1,6 @@
11{ buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
22, libelf, cpio
3−, utillinux
3+, utillinuxMinimal
44, writeTextFile
55}:
66
@@ -281,7 +281,7 @@ let
281281in
282282
283283assert stdenv.lib.versionAtLeast version "4.14" -> libelf != null;
284−assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null;
284+assert stdenv.lib.versionAtLeast version "4.15" -> utillinuxMinimal != null;
285285stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // {
286286 pname = "linux";
287287 inherit version;
@@ -292,7 +292,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches
292292 nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ]
293293 ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools
294294 ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf
295− ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux
295+ ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinuxMinimal
296296 ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ]
297297 ++ optional (stdenv.lib.versionAtLeast version "5.2") cpio
298298 ;
pkgs/servers/dex/default.nix+2−2
@@ -22,8 +22,8 @@ buildGoPackage rec {
2222 ];
2323
2424 postInstall = ''
25− mkdir -p $bin/share
26− cp -r $src/web $bin/share/web
25+ mkdir -p $out/share
26+ cp -r $src/web $out/share/web
2727 '';
2828
2929 meta = with lib; {
pkgs/servers/etcd/default.nix+1−1
@@ -22,7 +22,7 @@ buildGoPackage rec {
2222 '';
2323
2424 installPhase = ''
25− install -Dm755 bin/* bin/functional/cmd/* -t $bin/bin
25+ install -Dm755 bin/* bin/functional/cmd/* -t $out/bin
2626 '';
2727
2828 passthru.tests = with nixosTests; {
pkgs/servers/meguca/default.nix+3−3
@@ -35,9 +35,9 @@ buildGoPackage {
3535 '';
3636
3737 installPhase = ''
38− mkdir -p $bin/bin $bin/share/meguca
39− cp meguca $bin/bin
40− cp -r www $bin/share/meguca
38+ mkdir -p $out/bin $out/share/meguca
39+ cp meguca $out/bin
40+ cp -r www $out/share/meguca
4141 '';
4242
4343 meta = with stdenv.lib; {
pkgs/servers/miniflux/default.nix+1−1
@@ -20,7 +20,7 @@ buildGoPackage rec {
2020 '';
2121
2222 postInstall = ''
23− mv $bin/bin/miniflux.app $bin/bin/miniflux
23+ mv $out/bin/miniflux.app $out/bin/miniflux
2424 '';
2525
2626 meta = with stdenv.lib; {
pkgs/servers/monitoring/grafana-reporter/default.nix+1−1
@@ -19,7 +19,7 @@ buildGoPackage rec {
1919 };
2020
2121 postInstall = ''
22− wrapProgram $bin/bin/grafana-reporter \
22+ wrapProgram $out/bin/grafana-reporter \
2323 --prefix PATH : ${makeBinPath [ tetex ]}
2424 '';
2525
pkgs/servers/monitoring/grafana/default.nix+3−3
@@ -29,10 +29,10 @@ buildGoPackage rec {
2929
3030 postInstall = ''
3131 tar -xvf $srcStatic
32− mkdir -p $bin/share/grafana
33− mv grafana-*/{public,conf,tools} $bin/share/grafana/
32+ mkdir -p $out/share/grafana
33+ mv grafana-*/{public,conf,tools} $out/share/grafana/
3434 '' + lib.optionalString phantomJsSupport ''
35− ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/tools/phantomjs/phantomjs
35+ ln -sf ${phantomjs2}/bin/phantomjs $out/share/grafana/tools/phantomjs/phantomjs
3636 '';
3737
3838 meta = with lib; {
pkgs/servers/monitoring/loki/default.nix+1−1
@@ -24,7 +24,7 @@ buildGoPackage rec {
2424 buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ];
2525
2626 preFixup = stdenv.lib.optionalString stdenv.isLinux ''
27− wrapProgram $bin/bin/promtail \
27+ wrapProgram $out/bin/promtail \
2828 --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib"
2929 '';
3030
pkgs/servers/monitoring/prometheus/alertmanager.nix+1−1
@@ -27,7 +27,7 @@ buildGoPackage rec {
2727 nativeBuildInputs = [ installShellFiles ];
2828
2929 postInstall = ''
30− $bin/bin/amtool --completion-script-bash > amtool.bash
30+ $out/bin/amtool --completion-script-bash > amtool.bash
3131 installShellCompletion amtool.bash
3232 '';
3333
pkgs/servers/monitoring/prometheus/default.nix+3−3
@@ -54,9 +54,9 @@ in buildGoPackage rec {
5454 '';
5555
5656 preInstall = ''
57− mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
58− cp -a $src/documentation/* $bin/share/doc/prometheus
59− cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
57+ mkdir -p "$out/share/doc/prometheus" "$out/etc/prometheus"
58+ cp -a $src/documentation/* $out/share/doc/prometheus
59+ cp -a $src/console_libraries $src/consoles $out/etc/prometheus
6060 '';
6161
6262 doCheck = true;
pkgs/servers/monitoring/prometheus/postfix-exporter.nix+1−1
@@ -43,7 +43,7 @@ buildGoPackage rec {
4343 ];
4444
4545 postInstall = optionalString withSystemdSupport ''
46− wrapProgram $bin/bin/postfix_exporter \
46+ wrapProgram $out/bin/postfix_exporter \
4747 --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib"
4848 '';
4949
pkgs/servers/monitoring/prometheus/pushgateway.nix+1−1
@@ -29,7 +29,7 @@ buildGoPackage rec {
2929
3030 doInstallCheck = true;
3131 installCheckPhase = ''
32− export PATH=$PATH:$bin/bin
32+ export PATH=$PATH:$out/bin
3333
3434 pushgateway --help
3535
pkgs/servers/monitoring/uchiwa/default.nix+2−2
@@ -16,7 +16,7 @@ let
1616 goPackagePath = "github.com/${owner}/${repo}";
1717 inherit src;
1818 postInstall = ''
19− mkdir $out
19+ mkdir -p $out
2020 cp go/src/github.com/sensu/uchiwa/public/index.html $out/
2121 '';
2222 };
@@ -37,7 +37,7 @@ in stdenv.mkDerivation {
3737
3838 buildCommand = ''
3939 mkdir -p $out/bin $out/public
40− makeWrapper ${backend.bin}/bin/uchiwa $out/bin/uchiwa \
40+ makeWrapper ${backend}/bin/uchiwa $out/bin/uchiwa \
4141 --add-flags "-p $out/public"
4242 ln -s ${backend.out}/index.html $out/public/index.html
4343 ln -s ${frontend.out}/bower_components $out/public/bower_components
pkgs/servers/nginx-sso/default.nix+2−2
@@ -15,8 +15,8 @@ buildGoPackage rec {
1515 };
1616
1717 postInstall = ''
18− mkdir -p $bin/share
19− cp -R $src/frontend $bin/share
18+ mkdir -p $out/share
19+ cp -R $src/frontend $out/share
2020 '';
2121
2222 meta = with stdenv.lib; {
pkgs/servers/sql/cockroachdb/default.nix+2−6
@@ -42,7 +42,7 @@ buildGoPackage rec {
4242 installPhase = ''
4343 runHook preInstall
4444
45− install -D cockroachoss $bin/bin/cockroach
45+ install -D cockroachoss $out/bin/cockroach
4646 installShellCompletion cockroach.bash
4747
4848 mkdir -p $man/share/man
@@ -51,11 +51,7 @@ buildGoPackage rec {
5151 runHook postInstall
5252 '';
5353
54− # Unfortunately we have to keep an empty reference to $out, because it seems
55− # buildGoPackages only nukes references to the go compiler under $bin, effectively
56− # making all binary output under $bin mandatory. Ideally, we would just use
57− # $out and $man and remove $bin since there's no point in an empty path. :(
58− outputs = [ "bin" "man" "out" ];
54+ outputs = [ "out" "man" ];
5955
6056 meta = with stdenv.lib; {
6157 homepage = "https://www.cockroachlabs.com";
pkgs/stdenv/generic/make-derivation.nix+27
@@ -49,6 +49,7 @@ in rec {
4949 # Configure Phase
5050 , configureFlags ? []
5151 , cmakeFlags ? []
52+ , mesonFlags ? []
5253 , # Target is not included by default because most programs don't care.
5354 # Including it then would cause needless mass rebuilds.
5455 #
@@ -252,6 +253,32 @@ in rec {
252253 ++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}"
253254 ++ lib.optional (stdenv.buildPlatform.uname.processor != null) "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}"
254255 ++ lib.optional (stdenv.buildPlatform.uname.release != null) "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}";
256+
257+ mesonFlags = if mesonFlags == null then null else let
258+ # See https://mesonbuild.com/Reference-tables.html#cpu-families
259+ cpuFamily = platform: with platform;
260+ /**/ if isAarch32 then "arm"
261+ else if isAarch64 then "aarch64"
262+ else if isx86_32 then "x86"
263+ else if isx86_64 then "x86_64"
264+ else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits;
265+ crossFile = builtins.toFile "cross-file.conf" (''
266+ [properties]
267+ needs_exe_wrapper = true
268+
269+ [host_machine]
270+ system = '${stdenv.targetPlatform.parsed.kernel.name}'
271+ cpu_family = '${cpuFamily stdenv.targetPlatform}'
272+ cpu = '${stdenv.targetPlatform.parsed.cpu.name}'
273+ endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"}
274+ ''
275+ # TODO should have target prefix too, issue #86077
276+ + ''
277+
278+ [binaries]
279+ pkgconfig = 'pkg-config'
280+ '');
281+ in [ "--cross-file=${crossFile}" ] ++ mesonFlags;
255282 } // lib.optionalAttrs (attrs.enableParallelBuilding or false) {
256283 enableParallelChecking = attrs.enableParallelChecking or true;
257284 } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) {
pkgs/tools/admin/docker-credential-helpers/default.nix+3−3
@@ -32,11 +32,11 @@ buildGoPackage rec {
3232 installPhase =
3333 if stdenv.isDarwin
3434 then ''
35− install -Dm755 -t $bin/bin bin/docker-credential-osxkeychain
35+ install -Dm755 -t $out/bin bin/docker-credential-osxkeychain
3636 ''
3737 else ''
38− install -Dm755 -t $bin/bin bin/docker-credential-pass
39− install -Dm755 -t $bin/bin bin/docker-credential-secretservice
38+ install -Dm755 -t $out/bin bin/docker-credential-pass
39+ install -Dm755 -t $out/bin bin/docker-credential-secretservice
4040 '';
4141
4242 meta = with stdenv.lib; {
pkgs/tools/admin/lxd/default.nix+2−2
@@ -31,9 +31,9 @@ buildGoPackage rec {
3131
3232 postInstall = ''
3333 # test binaries, code generation
34− rm $bin/bin/{deps,macaroon-identity,generate}
34+ rm $out/bin/{deps,macaroon-identity,generate}
3535
36− wrapProgram $bin/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [
36+ wrapProgram $out/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [
3737 acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash criu
3838 (writeShellScriptBin "apparmor_parser" ''
3939 exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@"
pkgs/tools/backup/diskrsync/default.nix+1−1
@@ -17,7 +17,7 @@ buildGoPackage rec {
1717 buildInputs = [ makeWrapper ];
1818
1919 preFixup = ''
20− wrapProgram "$bin/bin/diskrsync" --argv0 diskrsync --prefix PATH : ${openssh}/bin
20+ wrapProgram "$out/bin/diskrsync" --argv0 diskrsync --prefix PATH : ${openssh}/bin
2121 '';
2222
2323 meta = with stdenv.lib; {
pkgs/tools/backup/duplicacy/default.nix+1−1
@@ -19,7 +19,7 @@ buildGoPackage rec {
1919 '';
2020
2121 installPhase = ''
22− install -D duplicacy_main $bin/bin/duplicacy
22+ install -D duplicacy_main $out/bin/duplicacy
2323 '';
2424
2525 meta = with lib; {
pkgs/tools/backup/restic/default.nix+1−1
@@ -20,7 +20,7 @@ buildGoPackage rec {
2020 passthru.tests.restic = nixosTests.restic;
2121
2222 postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
23− $bin/bin/restic generate \
23+ $out/bin/restic generate \
2424 --bash-completion restic.bash \
2525 --zsh-completion restic.zsh \
2626 --man .
pkgs/tools/backup/restic/rest-server.nix+1−1
@@ -19,7 +19,7 @@ buildGoPackage rec {
1919 '';
2020
2121 installPhase = ''
22− install -Dt $bin/bin rest-server
22+ install -Dt $out/bin rest-server
2323 '';
2424
2525 meta = with lib; {
pkgs/tools/filesystems/gcsfuse/default.nix+2−2
@@ -16,8 +16,8 @@ buildGoPackage rec {
1616 subPackages = [ "." "tools/mount_gcsfuse" ];
1717
1818 postInstall = ''
19− ln -s $bin/bin/mount_gcsfuse $bin/bin/mount.gcsfuse
20− ln -s $bin/bin/mount_gcsfuse $bin/bin/mount.fuse.gcsfuse
19+ ln -s $out/bin/mount_gcsfuse $out/bin/mount.gcsfuse
20+ ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse
2121 '';
2222
2323 meta = with lib;{
pkgs/tools/misc/aptly/default.nix+1−1
@@ -33,7 +33,7 @@ buildGoPackage {
3333
3434 postInstall = ''
3535 installShellCompletion --bash ${aptlyCompletionSrc}/aptly
36− wrapProgram "$bin/bin/aptly" \
36+ wrapProgram "$out/bin/aptly" \
3737 --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg bzip2 xz graphviz ]}"
3838 '';
3939
pkgs/tools/misc/direnv/default.nix+3−3
@@ -23,9 +23,9 @@ buildGoPackage rec {
2323
2424 installPhase = ''
2525 mkdir -p $out
26− make install DESTDIR=$bin
27− mkdir -p $bin/share/fish/vendor_conf.d
28− echo "eval ($bin/bin/direnv hook fish)" > $bin/share/fish/vendor_conf.d/direnv.fish
26+ make install DESTDIR=$out
27+ mkdir -p $out/share/fish/vendor_conf.d
28+ echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish
2929 '';
3030
3131 meta = with stdenv.lib; {
pkgs/tools/misc/mongodb-tools/default.nix+1−1
@@ -45,7 +45,7 @@ in buildGoPackage {
4545 runHook preBuild
4646
4747 ${stdenv.lib.concatMapStrings (t: ''
48− go build -o "$bin/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main
48+ go build -o "$out/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main
4949 '') tools}
5050
5151 runHook postBuild
pkgs/tools/misc/phraseapp-client/default.nix+1−1
@@ -15,7 +15,7 @@ buildGoPackage rec {
1515 };
1616
1717 postInstall = ''
18− ln -s $bin/bin/phraseapp-client $bin/bin/phraseapp
18+ ln -s $out/bin/phraseapp-client $out/bin/phraseapp
1919 '';
2020
2121 meta = with stdenv.lib; {
pkgs/tools/misc/tewisay/default.nix+3−3
@@ -18,12 +18,12 @@ buildGoPackage rec {
1818 goDeps = ./deps.nix;
1919
2020 postInstall = ''
21− install -D -t $bin/share/tewisay/cows go/src/${goPackagePath}/cows/*.cow
21+ install -D -t $out/share/tewisay/cows go/src/${goPackagePath}/cows/*.cow
2222 '';
2323
2424 preFixup = ''
25− wrapProgram $bin/bin/tewisay \
26− --prefix COWPATH : $bin/share/tewisay/cows
25+ wrapProgram $out/bin/tewisay \
26+ --prefix COWPATH : $out/share/tewisay/cows
2727 '';
2828
2929 meta = {
pkgs/tools/networking/assh/default.nix+1−1
@@ -10,7 +10,7 @@ buildGoPackage rec {
1010 nativeBuildInputs = [ makeWrapper ];
1111
1212 postInstall = ''
13− wrapProgram "$bin/bin/assh" \
13+ wrapProgram "$out/bin/assh" \
1414 --prefix PATH : ${openssh}/bin
1515 '';
1616
pkgs/tools/networking/dd-agent/datadog-agent.nix+8−8
@@ -47,8 +47,8 @@ in buildGoPackage rec {
4747
4848 # DataDog use paths relative to the agent binary, so fix these.
4949 postPatch = ''
50− sed -e "s|PyChecksPath =.*|PyChecksPath = \"$bin/${python.sitePackages}\"|" \
51− -e "s|distPath =.*|distPath = \"$bin/share/datadog-agent\"|" \
50+ sed -e "s|PyChecksPath =.*|PyChecksPath = \"$out/${python.sitePackages}\"|" \
51+ -e "s|distPath =.*|distPath = \"$out/share/datadog-agent\"|" \
5252 -i cmd/agent/common/common_nix.go
5353 sed -e "s|/bin/hostname|${lib.getBin hostname}/bin/hostname|" \
5454 -i pkg/util/hostname_nix.go
@@ -57,14 +57,14 @@ in buildGoPackage rec {
5757 # Install the config files and python modules from the "dist" dir
5858 # into standard paths.
5959 postInstall = ''
60− mkdir -p $bin/${python.sitePackages} $bin/share/datadog-agent
61− cp -R $src/cmd/agent/dist/conf.d $bin/share/datadog-agent
62− cp -R $src/cmd/agent/dist/{checks,utils,config.py} $bin/${python.sitePackages}
60+ mkdir -p $out/${python.sitePackages} $out/share/datadog-agent
61+ cp -R $src/cmd/agent/dist/conf.d $out/share/datadog-agent
62+ cp -R $src/cmd/agent/dist/{checks,utils,config.py} $out/${python.sitePackages}
6363
64− cp -R $src/pkg/status/dist/templates $bin/share/datadog-agent
64+ cp -R $src/pkg/status/dist/templates $out/share/datadog-agent
6565
66− wrapProgram "$bin/bin/agent" \
67− --set PYTHONPATH "$bin/${python.sitePackages}" \
66+ wrapProgram "$out/bin/agent" \
67+ --set PYTHONPATH "$out/${python.sitePackages}" \
6868 --prefix LD_LIBRARY_PATH : ${systemd.lib}/lib
6969 '';
7070
pkgs/tools/networking/guardian-agent/default.nix+4−4
@@ -23,14 +23,14 @@ buildGoPackage rec {
2323 goDeps = ./deps.nix;
2424
2525 postInstall = ''
26− mkdir -p $bin/bin $out/share/doc/${pname}
27− cp -v ./go/src/github.com/StanfordSNR/${pname}/scripts/* $bin/bin/
26+ mkdir -p $out/bin $out/share/doc/${pname}
27+ cp -v ./go/src/github.com/StanfordSNR/${pname}/scripts/* $out/bin/
2828 cp -vr ./go/src/github.com/StanfordSNR/${pname}/{AUTHORS,doc,LICENSE,README.md} $out/share/doc/guardian-agent
2929 '';
3030
3131 postFixup = ''
32− wrapProgram $bin/bin/sga-guard \
33− --prefix PATH : "$bin/bin" \
32+ wrapProgram $out/bin/sga-guard \
33+ --prefix PATH : "$out/bin" \
3434 --prefix PATH : "${autossh}/bin"
3535 '';
3636
pkgs/tools/package-management/morph/default.nix+2−2
@@ -29,10 +29,10 @@ buildGoPackage rec {
2929 postInstall = ''
3030 mkdir -p $lib
3131 cp -v $src/data/*.nix $lib
32− wrapProgram $bin/bin/morph --prefix PATH : ${lib.makeBinPath [ openssh ]};
32+ wrapProgram $out/bin/morph --prefix PATH : ${lib.makeBinPath [ openssh ]};
3333 '';
3434
35− outputs = [ "out" "bin" "lib" ];
35+ outputs = [ "out" "lib" ];
3636
3737 meta = with lib; {
3838 description = "Morph is a NixOS host manager written in Golang.";
pkgs/tools/security/gopass/default.nix+2−2
@@ -23,13 +23,13 @@ buildGoPackage rec {
2323
2424 postInstall = ''
2525 for shell in bash fish zsh; do
26− $bin/bin/gopass completion $shell > gopass.$shell
26+ $out/bin/gopass completion $shell > gopass.$shell
2727 installShellCompletion gopass.$shell
2828 done
2929 '';
3030
3131 postFixup = ''
32− wrapProgram $bin/bin/gopass \
32+ wrapProgram $out/bin/gopass \
3333 --prefix PATH : "${wrapperPath}"
3434 '';
3535
pkgs/tools/security/notary/default.nix+1−1
@@ -26,7 +26,7 @@ buildGoPackage rec {
2626
2727 installPhase = ''
2828 runHook preInstall
29− install -D bin/notary $bin/bin/notary
29+ install -D bin/notary $out/bin/notary
3030 runHook postInstall
3131 '';
3232
pkgs/tools/security/vault/default.nix+1−1
@@ -23,7 +23,7 @@ buildGoPackage rec {
2323 ];
2424
2525 postInstall = ''
26− echo "complete -C $bin/bin/vault vault" > vault.bash
26+ echo "complete -C $out/bin/vault vault" > vault.bash
2727 installShellCompletion vault.bash
2828 '';
2929
pkgs/tools/security/verifpal/default.nix+2−2
@@ -28,8 +28,8 @@ buildGoPackage rec {
2828 '';
2929
3030 installPhase = ''
31− mkdir -p $bin/bin
32− cp go/src/$goPackagePath/build/bin/linux/verifpal $bin/bin/
31+ mkdir -p $out/bin
32+ cp go/src/$goPackagePath/build/bin/linux/verifpal $out/bin/
3333 '';
3434
3535 meta = {
pkgs/tools/system/localtime/default.nix+1−1
@@ -16,7 +16,7 @@ buildGoPackage rec {
1616
1717 makeFlags = [
1818 "PREFIX=${placeholder "out"}"
19− "BINDIR=${placeholder "bin"}/bin"
19+ "BINDIR=${placeholder "out"}/bin"
2020 ];
2121
2222 buildPhase = ''
pkgs/tools/text/gawk/default.nix+2−2
@@ -19,11 +19,11 @@ let
1919 inherit (stdenv.lib) optional;
2020in
2121stdenv.mkDerivation rec {
22− name = "gawk-5.0.1";
22+ name = "gawk-5.1.0";
2323
2424 src = fetchurl {
2525 url = "mirror://gnu/gawk/${name}.tar.xz";
26− sha256 = "15570p7g2x54asvr2fsc56sxzmm08fbk4mzpcs5n92fp9vq8cklf";
26+ sha256 = "1gc2cccqy1x1bf6rhwlmd8q7dz7gnam6nwgl38bxapv6qm5flpyg";
2727 };
2828
2929 # When we do build separate interactive version, it makes sense to always include man.
pkgs/tools/virtualization/cri-tools/default.nix+1−1
@@ -14,7 +14,7 @@ buildGoPackage rec {
1414
1515 buildPhase = ''
1616 pushd go/src/${goPackagePath}
17− make all install BINDIR=$bin/bin
17+ make all install BINDIR=$out/bin
1818 '';
1919
2020 meta = with lib; {
pkgs/tools/virtualization/distrobuilder/default.nix+1−1
@@ -23,7 +23,7 @@ buildGoPackage rec {
2323 goDeps = ./deps.nix;
2424
2525 postInstall = ''
26− wrapProgram $bin/bin/distrobuilder --prefix PATH ":" ${binPath}
26+ wrapProgram $out/bin/distrobuilder --prefix PATH ":" ${binPath}
2727 '';
2828 nativeBuildInputs = [ pkgconfig makeWrapper ];
2929
pkgs/top-level/all-packages.nix+4−5
@@ -5739,10 +5739,7 @@ in
57395739
57405740 pal = callPackage ../tools/misc/pal { };
57415741
5742− pandoc = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.pandoc) (drv: {
5743− configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"];
5744− buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed];
5745− });
5742+ pandoc = callPackage ../development/tools/pandoc { };
57465743
57475744 pamtester = callPackage ../tools/security/pamtester { };
57485745
@@ -6649,6 +6646,8 @@ in
66496646 python = python3;
66506647 };
66516648
6649+ sof-firmware = callPackage ../os-specific/linux/firmware/sof-firmware { };
6650+
66526651 softhsm = callPackage ../tools/security/softhsm {
66536652 inherit (darwin) libobjc;
66546653 inherit (darwin.apple_sdk.frameworks) Security;
@@ -17880,7 +17879,7 @@ in
1788017879
1788117880 ledger-udev-rules = callPackage ../os-specific/linux/ledger-udev-rules {};
1788217881
17883− inherit (callPackages ../data/fonts/redhat-liberation-fonts { })
17882+ inherit (callPackages ../data/fonts/liberation-fonts { })
1788417883 liberation_ttf_v1
1788517884 liberation_ttf_v2
1788617885 ;