···192192193193- `lib.systems.examples.ghcjs` and consequently `pkgsCross.ghcjs` now use the target triplet `javascript-unknown-ghcjs` instead of `js-unknown-ghcjs`. This has been done to match an [upstream decision](https://gitlab.haskell.org/ghc/ghc/-/commit/6636b670233522f01d002c9b97827d00289dbf5c) to follow Cabal's platform naming more closely. Nixpkgs will also reject `js` as an architecture name.194194195195+- `dokuwiki` has been updated from 2023-07-31a (Igor) to 2023-04-04 (Jack Jackrum), which has [completely removed](https://www.dokuwiki.org/changes#release_2023-04-04_jack_jackrum) the options to embed HTML and PHP for security reasons. The [htmlok plugin](https://www.dokuwiki.org/plugin:htmlok) can be used to regain this functionality.196196+195197- The old unsupported version 6.x of the ELK-stack and Elastic beats have been removed. Use OpenSearch instead.196198197199- The `cosmoc` package has been removed. The upstream scripts in `cosmocc` should be used instead.
···22fixupOutputHooks+=('convertDesktopFiles $prefix')3344# Get a param out of a desktop file. First parameter is the file and the second55-# is a pattern of the key who's value we should fetch.55+# is the key who's value we should fetch.66getDesktopParam() {77- local file="$1";88- local pattern="$2";77+ local file="$1"88+ local key="$2"99+ local line k v9101010- awk -F "=" "/${pattern}/ {print \$2}" "${file}"1111+ while read -r line; do1212+ if [[ "$line" = *=* ]]; then1313+ k="${line%%=*}"1414+ v="${line#*=}"1515+1616+ if [[ "$k" = "$key" ]]; then1717+ echo "$v"1818+ return1919+ fi2020+ fi2121+ done < "$file"2222+2323+ return 11124}12251326# Convert a freedesktop.org icon theme for a given app to a .icns file. When possible, missing···5441 $((iconSize - 2))x$((iconSize - 2))${scaleSuffix}5542 )56434444+ local fallbackIcon=4545+5746 for iconIndex in "${!candidateIcons[@]}"; do5847 for maybeSize in "${validSizes[@]}"; do5948 icon=${candidateIcons[$iconIndex]}6049 if [[ $icon = */$maybeSize/* ]]; then6150 if [[ $maybeSize = $exactSize ]]; then6251 echo "fixed $icon"5252+ return 06353 else6454 echo "threshold $icon"5555+ return 06556 fi6666- elif [[ -a $icon ]]; then6767- echo "fallback $icon"5757+ elif [[ -a $icon && -z "$fallbackIcon" ]]; then5858+ fallbackIcon="$icon"6859 fi6969- return 07060 done7161 done6262+6363+ if [[ -n "$fallbackIcon" ]]; then6464+ echo "fallback $fallbackIcon"6565+ return 06666+ fi6767+7268 echo "scalable"7369 }7470···9068 local density=$((72 * scale))x$((72 * scale))9169 local dim=$((iconSize * scale))92707171+ echo "desktopToDarwinBundle: resizing icon $in to $out, size $dim" >&29372 magick convert -scale "${dim}x${dim}" -density "$density" -units PixelsPerInch "$in" "$out"9473 }9574···10380 if [[ $in != '-' ]]; then10481 local density=$((72 * scale))x$((72 * scale))10582 local dim=$((iconSize * scale))8383+8484+ echo "desktopToDarwinBundle: rasterizing svg $in to $out, size $dim" >&210685 rsvg-convert --keep-aspect-ratio --width "$dim" --height "$dim" "$in" --output "$out"10786 magick convert -density "$density" -units PixelsPerInch "$out" "$out"10887 else···146121 local icon=${iconResult#* }147122 local scaleSuffix=${scales[$scale]}148123 local result=${resultdir}/${iconSize}x${iconSize}${scales[$scale]}${scaleSuffix:+x}.png124124+ echo "desktopToDarwinBundle: using $type icon $icon for size $iconSize$scaleSuffix" >&2149125 case $type in150126 fixed)151127 local density=$((72 * scale))x$((72 * scale))···216190convertDesktopFile() {217191 local -r file=$1218192 local -r sharePath=$(dirname "$(dirname "$file")")219219- local -r name=$(getDesktopParam "${file}" "^Name")193193+ local -r name=$(getDesktopParam "${file}" "Name")220194 local -r macOSExec=$(getDesktopParam "${file}" "X-macOS-Exec")221195 if [[ "$macOSExec" ]]; then222196 local -r exec="$macOSExec"223197 else224198 local -r exec=$(processExecFieldCodes "${file}")225199 fi226226- local -r iconName=$(getDesktopParam "${file}" "^Icon")200200+ local -r iconName=$(getDesktopParam "${file}" "Icon")227201 local -r squircle=$(getDesktopParam "${file}" "X-macOS-SquircleIcon")228202229203 mkdir -p "${!outputBin}/Applications/${name}.app/Contents/MacOS"