git.iko.soy/typeable/nixpkgs
on master help sign in
Merge branch 'staging-next'
commit68c436b0ccc892c133d6d43a8355e81718829c55 authorVladimír Čunát <v@cunat.cz> dateFri 18 Sep 2020, 08:12 (6 years ago) parent72b9660372f89c
10 files changed+14−108
pkgs/build-support/bintools-wrapper/default.nix+1−1 pkgs/build-support/cc-wrapper/default.nix+1−1 pkgs/build-support/pkg-config-wrapper/default.nix+1−1 pkgs/build-support/rust/default.nix+1−1 pkgs/build-support/wrapper-common/utils.bash+3−3 pkgs/build-support/wrapper-common/utils.bash.darwin−92 pkgs/development/libraries/libde265/default.nix+2−2 pkgs/development/libraries/libheif/default.nix+2−2 pkgs/development/libraries/libwacom/default.nix+2−2 pkgs/os-specific/linux/kernel/manual-config.nix+1−3
pkgs/build-support/bintools-wrapper/default.nix+1−1
@@ -311,7 +311,7 @@ stdenv.mkDerivation {
311311
312312 substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
313313 substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
314− substituteAll ${if stdenv.isDarwin then ../wrapper-common/utils.bash.darwin else ../wrapper-common/utils.bash} $out/nix-support/utils.bash
314+ substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash
315315 ''
316316
317317 ##
pkgs/build-support/cc-wrapper/default.nix+1−1
@@ -459,7 +459,7 @@ stdenv.mkDerivation {
459459
460460 substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
461461 substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
462− substituteAll ${if stdenv.isDarwin then ../wrapper-common/utils.bash.darwin else ../wrapper-common/utils.bash} $out/nix-support/utils.bash
462+ substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash
463463 ''
464464
465465 ##
pkgs/build-support/pkg-config-wrapper/default.nix+1−1
@@ -107,7 +107,7 @@ stdenv.mkDerivation {
107107
108108 + ''
109109 substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
110− substituteAll ${if stdenv.isDarwin then ../wrapper-common/utils.bash.darwin else ../wrapper-common/utils.bash} $out/nix-support/utils.bash
110+ substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash
111111 ''
112112
113113 ##
pkgs/build-support/rust/default.nix+1−1
@@ -155,7 +155,7 @@ stdenv.mkDerivation (args // {
155155 echo
156156 echo "To fix the issue:"
157157 echo '1. Use "0000000000000000000000000000000000000000000000000000" as the cargoSha256 value'
158− echo "2. Build the derivation and wait it to fail with a hash mismatch"
158+ echo "2. Build the derivation and wait for it to fail with a hash mismatch"
159159 echo "3. Copy the 'got: sha256:' value back into the cargoSha256 field"
160160 echo
161161
pkgs/build-support/wrapper-common/utils.bash+3−3
@@ -69,9 +69,9 @@ badPath() {
6969 # directory (including the build directory).
7070 test \
7171 "$p" != "/dev/null" -a \
72− "${p#${NIX_STORE}}" = "$p" -a \
73− "${p#${TMP:-/tmp}}" = "$p" -a \
74− "${p#${NIX_BUILD_TOP}}" = "$p"
72+ "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \
73+ "${p:0:4}" != "/tmp" -a \
74+ "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP"
7575}
7676
7777expandResponseParams() {
pkgs/build-support/wrapper-common/utils.bash.darwindeleted−92
@@ -1,92 +0,0 @@
1−# Accumulate suffixes for taking in the right input parameters with the `mangle*`
2−# functions below. See setup-hook for details.
3−accumulateRoles() {
4− declare -ga role_suffixes=()
5− if [ "${NIX_@wrapperName@_TARGET_BUILD_@suffixSalt@:-}" ]; then
6− role_suffixes+=('_FOR_BUILD')
7− fi
8− if [ "${NIX_@wrapperName@_TARGET_HOST_@suffixSalt@:-}" ]; then
9− role_suffixes+=('')
10− fi
11− if [ "${NIX_@wrapperName@_TARGET_TARGET_@suffixSalt@:-}" ]; then
12− role_suffixes+=('_FOR_TARGET')
13− fi
14−}
15−
16−mangleVarList() {
17− local var="$1"
18− shift
19− local -a role_suffixes=("$@")
20−
21− local outputVar="${var}_@suffixSalt@"
22− declare -gx ${outputVar}+=''
23− # For each role we serve, we accumulate the input parameters into our own
24− # cc-wrapper-derivation-specific environment variables.
25− for suffix in "${role_suffixes[@]}"; do
26− local inputVar="${var}${suffix}"
27− if [ -v "$inputVar" ]; then
28− export ${outputVar}+="${!outputVar:+ }${!inputVar}"
29− fi
30− done
31−}
32−
33−mangleVarBool() {
34− local var="$1"
35− shift
36− local -a role_suffixes=("$@")
37−
38− local outputVar="${var}_@suffixSalt@"
39− declare -gxi ${outputVar}+=0
40− for suffix in "${role_suffixes[@]}"; do
41− local inputVar="${var}${suffix}"
42− if [ -v "$inputVar" ]; then
43− # "1" in the end makes `let` return success error code when
44− # expression itself evaluates to zero.
45− # We don't use `|| true` because that would silence actual
46− # syntax errors from bad variable values.
47− let "${outputVar} |= ${!inputVar:-0}" "1"
48− fi
49− done
50−}
51−
52−skip () {
53− if (( "${NIX_DEBUG:-0}" >= 1 )); then
54− echo "skipping impure path $1" >&2
55− fi
56−}
57−
58−
59−# Checks whether a path is impure. E.g., `/lib/foo.so' is impure, but
60−# `/nix/store/.../lib/foo.so' isn't.
61−badPath() {
62− local p=$1
63−
64− # Relative paths are okay (since they're presumably relative to
65− # the temporary build directory).
66− if [ "${p:0:1}" != / ]; then return 1; fi
67−
68− # Otherwise, the path should refer to the store or some temporary
69− # directory (including the build directory).
70− test \
71− "$p" != "/dev/null" -a \
72− "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \
73− "${p:0:4}" != "/tmp" -a \
74− "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP"
75−}
76−
77−expandResponseParams() {
78− declare -ga params=("$@")
79− local arg
80− for arg in "$@"; do
81− if [[ "$arg" == @* ]]; then
82− # phase separation makes this look useless
83− # shellcheck disable=SC2157
84− if [ -x "@expandResponseParams@" ]; then
85− # params is used by caller
86− #shellcheck disable=SC2034
87− readarray -d '' params < <("@expandResponseParams@" "$@")
88− return 0
89− fi
90− fi
91− done
92−}
pkgs/development/libraries/libde265/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
22
33stdenv.mkDerivation rec {
4− version = "1.0.5";
4+ version = "1.0.6";
55 pname = "libde265";
66
77 src = fetchFromGitHub {
88 owner = "strukturag";
99 repo = "libde265";
1010 rev = "v${version}";
11− sha256 = "1qisj8ryzbknam3hk81rq70fsd9mcpxm898bqygvbsmbwyvmz3pg";
11+ sha256 = "0ipccyavlgf7hfzx1g8bvzg62xq10vcxvwgq70r3z3j6mdvmrzjp";
1212 };
1313
1414 nativeBuildInputs = [ autoreconfHook pkgconfig ];
pkgs/development/libraries/libheif/default.nix+2−2
@@ -2,7 +2,7 @@
22
33stdenv.mkDerivation rec {
44 pname = "libheif";
5− version = "1.7.0";
5+ version = "1.8.0";
66
77 outputs = [ "bin" "out" "dev" "man" ];
88
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 owner = "strukturag";
1111 repo = "libheif";
1212 rev = "v${version}";
13− sha256 = "0alri5h486ck9b5z6wwrmlpzydhz58l223z3zxkizqrzxlllhr6p";
13+ sha256 = "15az44qdqp2vncdfv1bzdl30977kvqxcb2bhx4x3q6vcxnm1xfgg";
1414 };
1515
1616 nativeBuildInputs = [ autoreconfHook pkgconfig ];
pkgs/development/libraries/libwacom/default.nix+2−2
@@ -2,7 +2,7 @@
22
33stdenv.mkDerivation rec {
44 pname = "libwacom";
5− version = "1.4.1";
5+ version = "1.5";
66
77 outputs = [ "out" "dev" ];
88
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 owner = "linuxwacom";
1111 repo = "libwacom";
1212 rev = "libwacom-${version}";
13− sha256 = "0m96zjj832l18rzg9l31ambm6rv9vnh2a1sfk8531da8m347z287";
13+ sha256 = "1a3qkzpkag1vqd2xl7b7f2b8kbg1y1g6gg5ydzb1ppyqw3zdjf9x";
1414 };
1515
1616 nativeBuildInputs = [ pkgconfig meson ninja doxygen ];
pkgs/os-specific/linux/kernel/manual-config.nix+1−3
@@ -1,6 +1,5 @@
11{ buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
22, libelf, cpio, elfutils
3−, utillinuxMinimal
43, writeTextFile
54}:
65
@@ -281,7 +280,6 @@ let
281280in
282281
283282assert (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") -> libelf != null;
284−assert stdenv.lib.versionAtLeast version "4.15" -> utillinuxMinimal != null;
285283assert stdenv.lib.versionAtLeast version "5.8" -> elfutils != null;
286284
287285stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // {
@@ -294,7 +292,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches
294292 nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ]
295293 ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools
296294 ++ optional (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") libelf
297− ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinuxMinimal
295+ # Removed utillinuxMinimal since it should not be a dependency.
298296 ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ]
299297 ++ optional (stdenv.lib.versionAtLeast version "5.2") cpio
300298 ++ optional (stdenv.lib.versionAtLeast version "5.8") elfutils