diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-28 00:12:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-28 00:12:55 +0000 |
| commit | 8de0afeb83858c83e027ec1977fd5ac475479cc3 (patch) | |
| tree | ecfc0168730c89463cc1cd7828cd3c2379d29e27 /pkgs/build-support | |
| parent | 7f599f65111b55636eb6b8f1e50242f109edaeb1 (diff) | |
| parent | 5919d4081e2ef603b43b38bb8d923ecb24bbb78c (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/build-support/kernel/make-initrd-ng/Cargo.lock | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 6b8a03932f5b2..86bd7e312cbd3 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -637,7 +637,7 @@ rec { if tag != null then tag else - lib.head (lib.strings.splitString "-" (baseNameOf result.outPath)); + lib.head (lib.strings.splitString "-" (baseNameOf (builtins.unsafeDiscardStringContext result.outPath))); } '' ${lib.optionalString (tag == null) '' outName="$(basename "$out")" @@ -1001,7 +1001,7 @@ rec { if tag != null then tag else - lib.head (lib.strings.splitString "-" (baseNameOf conf.outPath)); + lib.head (lib.strings.splitString "-" (baseNameOf (builtins.unsafeDiscardStringContext conf.outPath))); paths = buildPackages.referencesByPopularity overallClosure; nativeBuildInputs = [ jq ]; } '' diff --git a/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock b/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock index 83e0fd3a2c5ef..61f71f6427778 100644 --- a/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock +++ b/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "eyre" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" dependencies = [ "indenter", "once_cell", |