Skip to content

Comments

darwin.diskdev_cmds: fix build on m1 by bumping xnu version#155077

Merged
siraben merged 1 commit intoNixOS:masterfrom
devins2518:diskdev_cmds
Jan 25, 2022
Merged

darwin.diskdev_cmds: fix build on m1 by bumping xnu version#155077
siraben merged 1 commit intoNixOS:masterfrom
devins2518:diskdev_cmds

Conversation

@devins2518
Copy link
Contributor

@devins2518 devins2518 commented Jan 15, 2022

Motivation for this change

diskdev_cmds failed to build, causing issues with nix-darwin configurations.

Things done

Bumped xnu version and copied over arm/ headers for diskdev_cmds.

xnu still fails to build, and I'm not sure how to fix it. This might be relevant to m1 only as the error is

clang-11: error: cannot use 'cpp-output' output with multiple -arch options`.
mig: fatal: "<no name yet>", line -1: no SubSystem declaration
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jan 15, 2022
@devins2518
Copy link
Contributor Author

devins2518 commented Jan 15, 2022

This should fix #145168

@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jan 15, 2022
@veprbl
Copy link
Member

veprbl commented Jan 15, 2022

This breaks x86_64-darwin stdenv that relies on xnu to build.

Also see a prior PR #110840

@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Jan 15, 2022
@devins2518
Copy link
Contributor Author

devins2518 commented Jan 15, 2022

@veprbl can you check if its fixed for x86_64-darwin? It still fails on aarch64-darwin with the error message

clang-11: error: invalid arch name '-arch arm64e'
mig: fatal: "<no name yet>", line -1: no SubSystem declaration

The arch was merged on Dec 3, 2020, while clang 11.1 was released on Feb 25, 2021.

@devins2518 devins2518 force-pushed the diskdev_cmds branch 2 times, most recently from cd24a5d to 0eb0c73 Compare January 16, 2022 03:42
@github-actions github-actions bot removed the 6.topic: stdenv Standard environment label Jan 16, 2022
@devins2518
Copy link
Contributor Author

devins2518 commented Jan 16, 2022

@veprbl I ended up just pulling the latest xnu tarball for the headers, so this shouldn't cause any issues for x86_64-darwin. xnu still doesn't build on M1 but that seems out of the scope of this PR.

@ofborg ofborg bot removed the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. label Jan 16, 2022
@ofborg ofborg bot requested a review from matthewbauer January 16, 2022 03:56
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. and removed 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. labels Jan 16, 2022
@veprbl
Copy link
Member

veprbl commented Jan 16, 2022

@veprbl can you check if its fixed for x86_64-darwin? It still fails on aarch64-darwin with the error message

clang-11: error: invalid arch name '-arch arm64e'
mig: fatal: "<no name yet>", line -1: no SubSystem declaration

The arch was merged on Dec 3, 2020, while clang 11.1 was released on Feb 25, 2021.

In our experience from #153441, it takes llvmPackages_13 to get arm64e support, plus our cc-wrapper may not handle well the -arch option.

@veprbl
Copy link
Member

veprbl commented Jan 16, 2022

@veprbl I ended up just pulling the latest xnu tarball for the headers, so this shouldn't cause any issues for x86_64-darwin. xnu still doesn't build on M1 but that seems out of the scope of this PR.

That's fine. Judging from reduced number of rebuilds, this should just work.

@GrahamcOfBorg build darwin.diskdev_cmds

@veprbl
Copy link
Member

veprbl commented Jan 16, 2022

Result of nixpkgs-review pr 155077 run on x86_64-darwin 1

360 packages marked as broken and skipped:
  • OVMF
  • OVMFFull
  • ajour
  • almanah
  • alpine-make-vm-image
  • arcan.arcan
  • arcan.xarcan
  • ares
  • atom
  • atom-beta
  • bareos
  • bespokesynth
  • biboumi
  • bitcoin-unlimited
  • bitcoind-unlimited
  • bluetooth_battery
  • bootiso
  • brickd
  • brltty
  • btrbk
  • bucklespring-libinput
  • cardboard
  • cloud-init
  • cloud-utils
  • clutter
  • collectd
  • collectd-data
  • connman_dmenu
  • cozy
  • dasher
  • datadog-agent
  • datadog-process-agent
  • debugedit
  • dfilemanager
  • dockle
  • entangle
  • exaile
  • falkon
  • fast-cli
  • fgallery
  • filebeat7
  • firefox-esr-91-unwrapped
  • firefox-esr-unwrapped
  • firefox-unwrapped
  • firefoxPackages.firefox
  • firefoxPackages.firefox-esr-91
  • flent
  • flex-ndax
  • gcr
  • germinal
  • gmic-qt-krita
  • gnome-recipes
  • gnome-text-editor
  • gnome.eog
  • gnome.gedit
  • gnome.nautilus-python
  • google-cloud-sdk-gce
  • gscan2pdf
  • gtkd
  • gtkmm4
  • gusb
  • i3
  • i3-balance-workspace
  • idasen
  • interlock
  • jellyfin-mpv-shim
  • journalbeat
  • journalbeat6
  • jpsxdec
  • kaffeine
  • kappanhang
  • kodiPackages.inputstream-adaptive
  • kodiPackages.inputstream-ffmpegdirect
  • kodiPackages.inputstream-rtmp
  • kodiPackages.joystick
  • kodiPackages.libretro
  • kodiPackages.libretro-genplus
  • kodiPackages.libretro-mgba
  • kodiPackages.libretro-snes9x
  • kodiPackages.pvr-hdhomerun
  • kodiPackages.pvr-hts
  • kodiPackages.pvr-iptvsimple
  • kodiPackages.steam-controller
  • kodiPackages.vfs-libarchive
  • kodiPackages.vfs-sftp
  • krunner-pass
  • labwc
  • latte-dock
  • libdazzle
  • liberio
  • libinput
  • liblogging
  • libmanette
  • libretro.dolphin
  • libsForQt5.alkimia
  • libsForQt5.packagekit-qt
  • libsForQt512.alkimia
  • libsForQt512.packagekit-qt
  • libsForQt514.alkimia
  • libsForQt514.packagekit-qt
  • libsForQt515.alkimia
  • libsForQt515.packagekit-qt
  • litecoin
  • litecoind
  • maia-icon-theme
  • mailspring
  • malcontent
  • malcontent-ui
  • mate.marco
  • mate.mate-control-center
  • mate.mate-polkit
  • mate.mate-power-manager
  • mate.mate-screensaver
  • mate.mate-session-manager
  • mate.mate-settings-daemon
  • mate.mate-system-monitor
  • mate.mate-terminal
  • mate.mate-utils
  • metadata-cleaner
  • mirakurun
  • mousai
  • multibootusb
  • musikcube
  • neard
  • networkmanager_dmenu
  • nixui
  • nvimpager
  • nwg-wrapper
  • odpdown
  • onboard
  • ori
  • packagekit
  • pandoc-drawio-filter
  • passExtensions.pass-tomb
  • patray
  • pcsx2
  • perl532Packages.Gtk3ImageView
  • perl532Packages.ImageSane
  • perl532Packages.LogJournald
  • perl534Packages.Gtk3ImageView
  • perl534Packages.ImageSane
  • perl534Packages.LogJournald
  • persepolis
  • picard
  • piglit
  • plasma-pass
  • plasma5Packages.alkimia
  • plasma5Packages.packagekit-qt
  • polkit
  • prometheus-postfix-exporter
  • pulseaudio
  • pulseaudio-hsphfpd
  • pulseaudioFull
  • puppeteer-cli
  • pykms
  • python310Packages.boxx
  • python310Packages.bpycv
  • python310Packages.bt-proximity
  • python310Packages.dogtail
  • python310Packages.ds4drv
  • python310Packages.einops
  • python310Packages.elegy
  • python310Packages.fjaraskupan
  • python310Packages.guestfs
  • python310Packages.halohome
  • python310Packages.homeassistant-pyozw
  • python310Packages.i3ipc
  • python310Packages.idasen
  • python310Packages.ignite
  • python310Packages.journalwatch
  • python310Packages.loo-py
  • python310Packages.paperwork-backend
  • python310Packages.paperwork-shell
  • python310Packages.protonvpn-nm-lib
  • python310Packages.pulsectl
  • python310Packages.py3status
  • python310Packages.pyautogui
  • python310Packages.pybluez
  • python310Packages.pycec
  • python310Packages.pyfuse3
  • python310Packages.pykulersky
  • python310Packages.pyro-ppl
  • python310Packages.pyscreeze
  • python310Packages.pystemd
  • python310Packages.python-gammu
  • python310Packages.python-uinput
  • python310Packages.python-vlc
  • python310Packages.pytorch
  • python310Packages.pytorch-lightning
  • python310Packages.pytorch-metric-learning
  • python310Packages.pytorchWithoutCuda
  • python310Packages.pyudev
  • python310Packages.pywebview
  • python310Packages.pywick
  • python310Packages.pywlroots
  • python310Packages.rising
  • python310Packages.rtslib
  • python310Packages.sane
  • python310Packages.skorch
  • python310Packages.slicer
  • python310Packages.spacy-transformers
  • python310Packages.stanza
  • python310Packages.supervise_api
  • python310Packages.systemd
  • python310Packages.tensorboardx
  • python310Packages.test-tube
  • python310Packages.torchgpipe
  • python310Packages.torchinfo
  • python310Packages.torchvision
  • python310Packages.treex
  • python310Packages.zcs
  • python39Packages.boxx
  • python39Packages.bpycv
  • python39Packages.bt-proximity
  • python39Packages.dogtail
  • python39Packages.ds4drv
  • python39Packages.einops
  • python39Packages.elegy
  • python39Packages.fjaraskupan
  • python39Packages.guestfs
  • python39Packages.halohome
  • python39Packages.homeassistant-pyozw
  • python39Packages.i3ipc
  • python39Packages.idasen
  • python39Packages.ignite
  • python39Packages.journalwatch
  • python39Packages.loo-py
  • python39Packages.paperwork-backend
  • python39Packages.paperwork-shell
  • python39Packages.protonvpn-nm-lib
  • python39Packages.pulsectl
  • python39Packages.py3status
  • python39Packages.pyautogui
  • python39Packages.pybluez
  • python39Packages.pycec
  • python39Packages.pyfuse3
  • python39Packages.pykulersky
  • python39Packages.pyro-ppl
  • python39Packages.pyscreeze
  • python39Packages.pystemd
  • python39Packages.python-gammu
  • python39Packages.python-uinput
  • python39Packages.python-vlc
  • python39Packages.pytorch
  • python39Packages.pytorch-lightning
  • python39Packages.pytorch-metric-learning
  • python39Packages.pytorchWithoutCuda
  • python39Packages.pyudev
  • python39Packages.pywebview
  • python39Packages.pywick
  • python39Packages.pywlroots
  • python39Packages.qiskit
  • python39Packages.qiskit-machine-learning
  • python39Packages.rising
  • python39Packages.rtslib
  • python39Packages.sane
  • python39Packages.shap
  • python39Packages.skorch
  • python39Packages.slicer
  • python39Packages.spacy-transformers
  • python39Packages.stanza
  • python39Packages.supervise_api
  • python39Packages.systemd
  • python39Packages.tensorboardx
  • python39Packages.test-tube
  • python39Packages.torchgpipe
  • python39Packages.torchinfo
  • python39Packages.torchvision
  • python39Packages.treex
  • python39Packages.zcs
  • qemu_full
  • qemu_xen
  • qemu_xen-light
  • qemu_xen_4_10
  • qemu_xen_4_10-light
  • qlcplus
  • qtile
  • quassel
  • quasselClient
  • quodlibet
  • quodlibet-full
  • quodlibet-without-gst-plugins
  • quodlibet-xine
  • quodlibet-xine-full
  • recapp
  • retroarchFull
  • rmfuse
  • rocketchat-desktop
  • rpcbind
  • rpi-imager
  • rshell
  • rubyPackages.ruby-lxc
  • rubyPackages_2_7.ruby-lxc
  • rubyPackages_3_0.ruby-lxc
  • rubyPackages_3_1.ruby-lxc
  • run-scaled
  • sanoid
  • secretscanner
  • sharedown
  • shutter
  • ssm-agent
  • strongswanNM
  • stubby
  • sublime-music
  • subsurface
  • surf
  • sway-contrib.grimshot
  • symbolic-preview
  • sysprof
  • telepresence
  • termite
  • termite-unwrapped
  • tetrd
  • tts
  • tvheadend
  • udiskie
  • uhub
  • unbound-full
  • unbound-with-systemd
  • update-resolv-conf
  • update-systemd-resolved
  • utox
  • vimix-gtk-themes
  • virt-manager-qt
  • vte
  • waffle
  • waybar
  • wayfire
  • wayfireApplications-unwrapped.wayfire
  • wayfireApplications-unwrapped.wayfirePlugins.wayfire
  • wayfireApplications-unwrapped.wayfirePlugins.wf-shell
  • wayfireApplications-unwrapped.wcm
  • wayfirePlugins.wayfire
  • wayfirePlugins.wf-shell
  • wcm
  • whitesur-gtk-theme
  • wimlib
  • wine64
  • wine64Packages.base
  • wine64Packages.full
  • wine64Packages.stable
  • wine64Packages.stableFull
  • wine64Packages.staging
  • wine64Packages.stagingFull
  • wine64Packages.unstable
  • wine64Packages.unstableFull
  • wshowkeys
  • x11basic
  • xfce.xfce4-weather-plugin
  • xfce.xfce4_weather_plugin
  • xorg.xf86inputevdev
  • xorg.xf86inputlibinput
  • xorg.xf86videoamdgpu
  • xorg.xf86videoati
  • xorg.xf86videonouveau
  • xorg.xf86videoopenchrome
  • xorg.xf86videoqxl
  • xulrunner
  • yambar
  • zoneminder
5 packages failed to build:
  • dashpay
  • elasticsearch (elasticsearch6)
  • pivx
  • pivxd
  • python310Packages.git-annex-adapter
25 packages built:
  • atinout
  • calc
  • darwin.diskdev_cmds
  • elasticsearch-oss (elasticsearch6-oss)
  • elasticsearch7
  • elasticsearchPlugins.analysis-icu
  • elasticsearchPlugins.analysis-lemmagen
  • elasticsearchPlugins.analysis-phonetic
  • elasticsearchPlugins.discovery-ec2
  • elasticsearchPlugins.ingest-attachment
  • elasticsearchPlugins.repository-gcs
  • elasticsearchPlugins.repository-s3
  • elasticsearchPlugins.search-guard
  • facter
  • git-quick-stats
  • git-recent
  • imag
  • ntfs3g (ntfsprogs)
  • openvpn_learnaddress
  • python39Packages.git-annex-adapter
  • rmlint
  • solanum
  • transcrypt
  • unnethack
  • vifm

@devins2518
Copy link
Contributor Author

devins2518 commented Jan 16, 2022

cc: @NixOS/darwin-maintainers for review and merge

@mikroskeem
Copy link
Member

mikroskeem commented Jan 16, 2022

Result of nixpkgs-review pr 155077 run on aarch64-darwin 1

50 packages marked as broken and skipped:
  • alpine-make-vm-image
  • bitcoin-unlimited
  • bitcoind-unlimited
  • litecoin
  • litecoind
  • ocamlPackages.torch
  • ori
  • pivx
  • python310Packages.einops
  • python310Packages.elegy
  • python310Packages.ignite
  • python310Packages.pyro-ppl
  • python310Packages.pytorch
  • python310Packages.pytorch-lightning
  • python310Packages.pytorch-metric-learning
  • python310Packages.pytorchWithoutCuda
  • python310Packages.pywick
  • python310Packages.rising
  • python310Packages.skorch
  • python310Packages.slicer
  • python310Packages.stanza
  • python310Packages.tensorboardx
  • python310Packages.test-tube
  • python310Packages.torchgpipe
  • python310Packages.torchinfo
  • python310Packages.torchvision
  • python310Packages.treex
  • python39Packages.einops
  • python39Packages.elegy
  • python39Packages.ignite
  • python39Packages.pyro-ppl
  • python39Packages.pytorch
  • python39Packages.pytorch-lightning
  • python39Packages.pytorch-metric-learning
  • python39Packages.pytorchWithoutCuda
  • python39Packages.pywick
  • python39Packages.qiskit
  • python39Packages.qiskit-machine-learning
  • python39Packages.rising
  • python39Packages.shap
  • python39Packages.skorch
  • python39Packages.slicer
  • python39Packages.stanza
  • python39Packages.tensorboardx
  • python39Packages.test-tube
  • python39Packages.torchgpipe
  • python39Packages.torchinfo
  • python39Packages.torchvision
  • python39Packages.treex
  • rpi-imager
8 packages failed to build:
  • dashpay
  • eject
  • elasticsearch
  • halfempty
  • logger
  • pivxd
  • unixtools.wall
  • unnethack
29 packages built:
  • atinout
  • calc
  • elasticsearch-oss
  • elasticsearchPlugins.analysis-icu
  • elasticsearchPlugins.analysis-lemmagen
  • elasticsearchPlugins.analysis-phonetic
  • elasticsearchPlugins.discovery-ec2
  • elasticsearchPlugins.ingest-attachment
  • elasticsearchPlugins.repository-gcs
  • elasticsearchPlugins.repository-s3
  • elasticsearchPlugins.search-guard
  • fishPlugins.fzf-fish
  • git-quick-stats
  • git-recent
  • imag
  • mount
  • ntfs3g
  • openvpn_learnaddress
  • python310Packages.git-annex-adapter
  • python39Packages.git-annex-adapter
  • quota
  • rmlint
  • solanum
  • transcrypt
  • umount
  • unixtools.fdisk
  • unixtools.fsck
  • unixtools.util-linux
  • vifm

@abathur abathur mentioned this pull request Jan 16, 2022
Merged
toonn
toonn reviewed Jan 16, 2022
View reviewed changes
Copy link
Contributor

@toonn toonn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The expression you're touching here is for x86_64-darwin. IIRC aarch64-darwin apple source releases are defined in apple-source-releases/macos-11.0.1.nix.

@devins2518
Copy link
Contributor Author

devins2518 commented Jan 16, 2022

That file seems to be auto-generated from the generate-sdl-packages.sh script so I don't think I should touch that file. I am able to build the package on aarch_64-darwin so it is working now. The diskdev_cmds/default.nix doesn't even pull the necessary arm/disklabel.h file so I don't think that I'm able to fix this without editing it.

@devins2518
Copy link
Contributor Author

devins2518 commented Jan 16, 2022

I just forced pushed a commit which added a small TODO noting why pulling a separate xnu tarball is necessary.

@toonn
Copy link
Contributor

toonn commented Jan 17, 2022 •
edited
Loading

What I mean is that we need to take into account the repercussions for x86_64-darwin. Unless the latest sources happen to build completely fine on macOS 10.12 and the interaction with system libraries is compatible the least we'll have to do is branch on the architecture to apply/not these changes.

I'm also unsure why a newer tarball is needed? Ideally the Apple source releases are kept somewhat in sync because they interdepend. The way to update XNU would still be to edit that file I mentioned though, IMO.

@devins2518 devins2518 force-pushed the diskdev_cmds branch 2 times, most recently from a178e10 to 09cc54c Compare January 17, 2022 22:04
@devins2518
Copy link
Contributor Author

devins2518 commented Jan 17, 2022

So I've done a bit of digging, and xnu from apple-source-releases/macos-11.0.1.nix is overwritten by apple-source-releases/default.nix. Even in a nix repl, darwin.xnu.src returns 3789.70.16, and there's no way to access it through the darwin attrset. My ugly solution is to pass in macosPackages_11_0_1 and use it directly from there if its running on Aarch64. There's definitely some soundness issues when we're overriding macosPackages_11_0_1 with older versions even on M1, but that's outside the scope of this PR.

@abathur
Copy link
Member

abathur commented Jan 18, 2022

Not entirely sure if this is helpful, but I was curious anyways:

Result of nixpkgs-review pr 155077 run on x86_64-darwin 1

364 packages marked as broken and skipped:
  • OVMF
  • OVMFFull
  • ajour
  • almanah
  • alpine-make-vm-image
  • arcan.arcan
  • arcan.xarcan
  • ares
  • atom
  • atom-beta
  • bareos
  • bedup
  • bespokesynth
  • biboumi
  • bitcoin-unlimited
  • bitcoind-unlimited
  • bluetooth_battery
  • bootiso
  • brickd
  • brltty
  • btrbk
  • bucklespring-libinput
  • cardboard
  • cloud-init
  • cloud-utils
  • clutter
  • collectd
  • collectd-data
  • connman_dmenu
  • cozy
  • dasher
  • datadog-agent
  • datadog-process-agent
  • debugedit
  • dfilemanager
  • dockle
  • entangle
  • exaile
  • falkon
  • fast-cli
  • fgallery
  • filebeat7
  • firefox-esr-91-unwrapped
  • firefox-esr-unwrapped
  • firefox-unwrapped
  • firefoxPackages.firefox
  • firefoxPackages.firefox-esr-91
  • flent
  • flex-ndax
  • gcr
  • germinal
  • gmic-qt-krita
  • gnome-recipes
  • gnome-text-editor
  • gnome.eog
  • gnome.gedit
  • gnome.nautilus-python
  • google-cloud-sdk-gce
  • gscan2pdf
  • gtkd
  • gtkmm4
  • gusb
  • i3
  • i3-balance-workspace
  • idasen
  • interlock
  • jellyfin-mpv-shim
  • journalbeat
  • journalbeat6
  • jpsxdec
  • kaffeine
  • kappanhang
  • kodiPackages.inputstream-adaptive
  • kodiPackages.inputstream-ffmpegdirect
  • kodiPackages.inputstream-rtmp
  • kodiPackages.joystick
  • kodiPackages.libretro
  • kodiPackages.libretro-genplus
  • kodiPackages.libretro-mgba
  • kodiPackages.libretro-snes9x
  • kodiPackages.pvr-hdhomerun
  • kodiPackages.pvr-hts
  • kodiPackages.pvr-iptvsimple
  • kodiPackages.steam-controller
  • kodiPackages.vfs-libarchive
  • kodiPackages.vfs-sftp
  • krunner-pass
  • labwc
  • latte-dock
  • libdazzle
  • liberio
  • libinput
  • liblogging
  • libmanette
  • libretro.dolphin
  • libsForQt5.alkimia
  • libsForQt5.packagekit-qt
  • libsForQt512.alkimia
  • libsForQt512.packagekit-qt
  • libsForQt514.alkimia
  • libsForQt514.packagekit-qt
  • libsForQt515.alkimia
  • libsForQt515.packagekit-qt
  • lightly-qt
  • litecoin
  • litecoind
  • maia-icon-theme
  • mailspring
  • malcontent
  • malcontent-ui
  • mate.marco
  • mate.mate-control-center
  • mate.mate-polkit
  • mate.mate-power-manager
  • mate.mate-screensaver
  • mate.mate-session-manager
  • mate.mate-settings-daemon
  • mate.mate-system-monitor
  • mate.mate-terminal
  • mate.mate-utils
  • metadata-cleaner
  • mirakurun
  • mousai
  • multibootusb
  • musikcube
  • neard
  • networkmanager_dmenu
  • nixui
  • nvimpager
  • nwg-wrapper
  • odpdown
  • onboard
  • ori
  • packagekit
  • pandoc-drawio-filter
  • passExtensions.pass-tomb
  • patray
  • pcsx2
  • perl532Packages.Gtk3ImageView
  • perl532Packages.ImageSane
  • perl532Packages.LogJournald
  • perl534Packages.Gtk3ImageView
  • perl534Packages.ImageSane
  • perl534Packages.LogJournald
  • persepolis
  • picard
  • piglit
  • plasma-pass
  • plasma5Packages.alkimia
  • plasma5Packages.packagekit-qt
  • polkit
  • prometheus-postfix-exporter
  • pulseaudio
  • pulseaudio-hsphfpd
  • pulseaudioFull
  • puppeteer-cli
  • pykms
  • python310Packages.bedup
  • python310Packages.boxx
  • python310Packages.bpycv
  • python310Packages.bt-proximity
  • python310Packages.dogtail
  • python310Packages.ds4drv
  • python310Packages.einops
  • python310Packages.elegy
  • python310Packages.fjaraskupan
  • python310Packages.guestfs
  • python310Packages.halohome
  • python310Packages.homeassistant-pyozw
  • python310Packages.i3ipc
  • python310Packages.idasen
  • python310Packages.ignite
  • python310Packages.journalwatch
  • python310Packages.loo-py
  • python310Packages.paperwork-backend
  • python310Packages.paperwork-shell
  • python310Packages.protonvpn-nm-lib
  • python310Packages.pulsectl
  • python310Packages.py3status
  • python310Packages.pyautogui
  • python310Packages.pybluez
  • python310Packages.pycec
  • python310Packages.pyfuse3
  • python310Packages.pykulersky
  • python310Packages.pyro-ppl
  • python310Packages.pyscreeze
  • python310Packages.pystemd
  • python310Packages.python-gammu
  • python310Packages.python-uinput
  • python310Packages.python-vlc
  • python310Packages.pytorch
  • python310Packages.pytorch-lightning
  • python310Packages.pytorch-metric-learning
  • python310Packages.pytorchWithoutCuda
  • python310Packages.pyudev
  • python310Packages.pywebview
  • python310Packages.pywick
  • python310Packages.pywlroots
  • python310Packages.rising
  • python310Packages.rtslib
  • python310Packages.sane
  • python310Packages.skorch
  • python310Packages.slicer
  • python310Packages.spacy-transformers
  • python310Packages.stanza
  • python310Packages.supervise_api
  • python310Packages.systemd
  • python310Packages.tensorboardx
  • python310Packages.test-tube
  • python310Packages.torchgpipe
  • python310Packages.torchinfo
  • python310Packages.torchvision
  • python310Packages.treex
  • python310Packages.zcs
  • python39Packages.bedup
  • python39Packages.boxx
  • python39Packages.bpycv
  • python39Packages.bt-proximity
  • python39Packages.dogtail
  • python39Packages.ds4drv
  • python39Packages.einops
  • python39Packages.elegy
  • python39Packages.fjaraskupan
  • python39Packages.guestfs
  • python39Packages.halohome
  • python39Packages.homeassistant-pyozw
  • python39Packages.i3ipc
  • python39Packages.idasen
  • python39Packages.ignite
  • python39Packages.journalwatch
  • python39Packages.loo-py
  • python39Packages.paperwork-backend
  • python39Packages.paperwork-shell
  • python39Packages.protonvpn-nm-lib
  • python39Packages.pulsectl
  • python39Packages.py3status
  • python39Packages.pyautogui
  • python39Packages.pybluez
  • python39Packages.pycec
  • python39Packages.pyfuse3
  • python39Packages.pykulersky
  • python39Packages.pyro-ppl
  • python39Packages.pyscreeze
  • python39Packages.pystemd
  • python39Packages.python-gammu
  • python39Packages.python-uinput
  • python39Packages.python-vlc
  • python39Packages.pytorch
  • python39Packages.pytorch-lightning
  • python39Packages.pytorch-metric-learning
  • python39Packages.pytorchWithoutCuda
  • python39Packages.pyudev
  • python39Packages.pywebview
  • python39Packages.pywick
  • python39Packages.pywlroots
  • python39Packages.qiskit
  • python39Packages.qiskit-machine-learning
  • python39Packages.rising
  • python39Packages.rtslib
  • python39Packages.sane
  • python39Packages.shap
  • python39Packages.skorch
  • python39Packages.slicer
  • python39Packages.spacy-transformers
  • python39Packages.stanza
  • python39Packages.supervise_api
  • python39Packages.systemd
  • python39Packages.tensorboardx
  • python39Packages.test-tube
  • python39Packages.torchgpipe
  • python39Packages.torchinfo
  • python39Packages.torchvision
  • python39Packages.treex
  • python39Packages.zcs
  • qemu_full
  • qemu_xen
  • qemu_xen-light
  • qemu_xen_4_10
  • qemu_xen_4_10-light
  • qlcplus
  • qtile
  • quassel
  • quasselClient
  • quodlibet
  • quodlibet-full
  • quodlibet-without-gst-plugins
  • quodlibet-xine
  • quodlibet-xine-full
  • recapp
  • retroarchFull
  • rmfuse
  • rocketchat-desktop
  • rpcbind
  • rpi-imager
  • rshell
  • rubyPackages.ruby-lxc
  • rubyPackages_2_7.ruby-lxc
  • rubyPackages_3_0.ruby-lxc
  • rubyPackages_3_1.ruby-lxc
  • run-scaled
  • sanoid
  • secretscanner
  • sharedown
  • shutter
  • ssm-agent
  • strongswanNM
  • stubby
  • sublime-music
  • subsurface
  • surf
  • sway-contrib.grimshot
  • symbolic-preview
  • sysprof
  • telepresence
  • termite
  • termite-unwrapped
  • tetrd
  • tts
  • tvheadend
  • udiskie
  • uhub
  • unbound-full
  • unbound-with-systemd
  • update-resolv-conf
  • update-systemd-resolved
  • utox
  • vimix-gtk-themes
  • virt-manager-qt
  • vte
  • waffle
  • waybar
  • wayfire
  • wayfireApplications-unwrapped.wayfire
  • wayfireApplications-unwrapped.wayfirePlugins.wayfire
  • wayfireApplications-unwrapped.wayfirePlugins.wf-shell
  • wayfireApplications-unwrapped.wcm
  • wayfirePlugins.wayfire
  • wayfirePlugins.wf-shell
  • wcm
  • whitesur-gtk-theme
  • wimlib
  • wine64
  • wine64Packages.base
  • wine64Packages.full
  • wine64Packages.stable
  • wine64Packages.stableFull
  • wine64Packages.staging
  • wine64Packages.stagingFull
  • wine64Packages.unstable
  • wine64Packages.unstableFull
  • wshowkeys
  • x11basic
  • xfce.xfce4-weather-plugin
  • xfce.xfce4_weather_plugin
  • xorg.xf86inputevdev
  • xorg.xf86inputlibinput
  • xorg.xf86videoamdgpu
  • xorg.xf86videoati
  • xorg.xf86videonouveau
  • xorg.xf86videoopenchrome
  • xorg.xf86videoqxl
  • xulrunner
  • yambar
  • zoneminder
30 packages failed to build:
  • atinout
  • calc
  • darwin.diskdev_cmds
  • dashpay
  • elasticsearch (elasticsearch6)
  • elasticsearch-oss (elasticsearch6-oss)
  • elasticsearch7
  • elasticsearchPlugins.analysis-icu
  • elasticsearchPlugins.analysis-lemmagen
  • elasticsearchPlugins.analysis-phonetic
  • elasticsearchPlugins.discovery-ec2
  • elasticsearchPlugins.ingest-attachment
  • elasticsearchPlugins.repository-gcs
  • elasticsearchPlugins.repository-s3
  • elasticsearchPlugins.search-guard
  • facter
  • git-quick-stats
  • git-recent
  • imag
  • ntfs3g (ntfsprogs)
  • openvpn_learnaddress
  • pivx
  • pivxd
  • python310Packages.git-annex-adapter
  • python39Packages.git-annex-adapter
  • rmlint
  • solanum
  • transcrypt
  • unnethack
  • vifm

@devins2518
Copy link
Contributor Author

devins2518 commented Jan 18, 2022

@abathur I think I fixed the issue, please try again

@abathur
Copy link
Member

abathur commented Jan 18, 2022

I started this late, since I figured I would want to walk away while it ran, but I went ahead and stopped it since diskdev_cmds failed pretty quickly:

$ nix log /nix/store/zr4fpg61f6xz39bv71058ibksh256vi4-diskdev_cmds-593.drv
@nix { "action": "setPhase", "phase": "unpackPhase" }
unpacking sources
unpacking source archive /nix/store/wysbq6qqajpr64vnkdnjjrr35qdrvpsw-diskdev_cmds-593.tar.gz
source root is diskdev_cmds-593
setting SOURCE_DATE_EPOCH to timestamp 1499744604 of file diskdev_cmds-593/vsdbutil.tproj/vsdbutil_main.c
@nix { "action": "setPhase", "phase": "patchPhase" }
patching sources
unpacking source archive /nix/store/n9wjh331dsm1x04q5wxh0lk9zk8clacl-Libc-1158.50.2.tar.gz
unpacking source archive /nix/store/58mgs7ibfmbfsn5qc1ljv2s7bvi8rncw-xnu-3789.70.16.tar.gz
cp: missing destination file operand after 'arm'

I'll try to check back in before bed just in case there's another... :)

@devins2518
Copy link
Contributor Author

devins2518 commented Jan 18, 2022

@abathur my bad, I forgot to remove the nonexistent arm directory for x86_64 😅. Now it should work.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. and removed 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. labels Jan 18, 2022
@abathur
Copy link
Member

abathur commented Jan 18, 2022

I get Nothing to be built. on this one. I suppose that may be right, if the goal is a no-op on x86? :)

@devins2518
Copy link
Contributor Author

devins2518 commented Jan 18, 2022

Yes, that's ideal.

cc: @toonn thoughts on these updates? Obviously it's not the best solution, but I'm unsure of how to access any of the macos_11_0 packages from anywhere. They're overwritten by apple_source_releases default.nix

@abathur abathur mentioned this pull request Jan 20, 2022
Merged
13 tasks
toonn
toonn reviewed Jan 24, 2022
View reviewed changes
Copy link
Contributor

@toonn toonn left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes look good to me now.
Does this actually build the macOS 11 version of diskdev_cmds on aarch64-darwin though, since all the source releases are merged with the 10.12 (or older) versions set?

The source releases weren't made available for M1 at the time indeed. @thefloweringash went with the SDK instead for the stdenv so there wasn't great need and it's a lot of work getting them to even build. I'm not sure how to move forward on that. Making them accessible at all seems like a pretty important step and then trying to get them to build. Eventually we could switch back to an open-source based stdenv.

@siraben
Copy link
Member

siraben commented Jan 24, 2022

Result of nixpkgs-review pr 155077 run on aarch64-darwin 1

50 packages marked as broken and skipped:
  • alpine-make-vm-image
  • bitcoin-unlimited
  • bitcoind-unlimited
  • litecoin
  • litecoind
  • ocamlPackages.torch
  • ori
  • pivx
  • python310Packages.einops
  • python310Packages.elegy
  • python310Packages.ignite
  • python310Packages.pyro-ppl
  • python310Packages.pytorch
  • python310Packages.pytorch-lightning
  • python310Packages.pytorch-metric-learning
  • python310Packages.pytorchWithoutCuda
  • python310Packages.pywick
  • python310Packages.rising
  • python310Packages.skorch
  • python310Packages.slicer
  • python310Packages.stanza
  • python310Packages.tensorboardx
  • python310Packages.test-tube
  • python310Packages.torchgpipe
  • python310Packages.torchinfo
  • python310Packages.torchvision
  • python310Packages.treex
  • python39Packages.einops
  • python39Packages.elegy
  • python39Packages.ignite
  • python39Packages.pyro-ppl
  • python39Packages.pytorch
  • python39Packages.pytorch-lightning
  • python39Packages.pytorch-metric-learning
  • python39Packages.pytorchWithoutCuda
  • python39Packages.pywick
  • python39Packages.qiskit
  • python39Packages.qiskit-machine-learning
  • python39Packages.rising
  • python39Packages.shap
  • python39Packages.skorch
  • python39Packages.slicer
  • python39Packages.stanza
  • python39Packages.tensorboardx
  • python39Packages.test-tube
  • python39Packages.torchgpipe
  • python39Packages.torchinfo
  • python39Packages.torchvision
  • python39Packages.treex
  • rpi-imager
7 packages failed to build:
  • dashpay
  • eject
  • elasticsearch
  • halfempty
  • logger
  • pivxd
  • unixtools.wall
30 packages built:
  • atinout
  • calc
  • elasticsearch-oss
  • elasticsearchPlugins.analysis-icu
  • elasticsearchPlugins.analysis-lemmagen
  • elasticsearchPlugins.analysis-phonetic
  • elasticsearchPlugins.discovery-ec2
  • elasticsearchPlugins.ingest-attachment
  • elasticsearchPlugins.repository-gcs
  • elasticsearchPlugins.repository-s3
  • elasticsearchPlugins.search-guard
  • fishPlugins.fzf-fish
  • git-quick-stats
  • git-recent
  • imag
  • mount
  • ntfs3g
  • openvpn_learnaddress
  • python310Packages.git-annex-adapter
  • python39Packages.git-annex-adapter
  • quota
  • rmlint
  • solanum
  • transcrypt
  • umount
  • unixtools.fdisk
  • unixtools.fsck
  • unixtools.util-linux
  • unnethack
  • vifm

@siraben siraben merged commit 4aa14a8 into NixOS:master Jan 25, 2022
@dvicory
Copy link

dvicory commented Jan 26, 2022

Would you say this is eligible to be backported to 21.11?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@toonn toonn toonn left review comments

@veprbl veprbl veprbl approved these changes

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

Assignees

No one assigned

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@devins2518 @veprbl @mikroskeem @toonn @abathur @siraben @dvicory