[pull] master from NixOS:master #119
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
Let’s point `DESTDIR` to a path under the build directory rather than under "$out". This will prevent `installPhase` from creating `$out` or any other output directory, allowing us to install the outputs just by moving them out of `$DESTDIR` directly into the store with `mv`. Of course, that will also require moving the installing of `etc` after the outputs are installed. Since `$out` does not currently contain `etc` subdirectory, we can also just move `$DESTDIR/etc` directly to `$out` rather than copying it. And even if `$out/etc` existed, we could just merge it with `cp --recursive` instead of `rsync` so `rsync` is not actually necessary. The code remains written defensively against files accidentally being misplaced while shuffling them around – parent directories of targets are used as `mv` destinations so that the move fails loudly if the directory already exists, rather than being moved inside as e.g. `$out/etc/etc`. While at it let’s also improve practices a bit: - Quote command arguments. - Move `DESTDIR` definition into `env` block. - Add vertical space and clearer comments. - Handle non-standard Nix store paths.
Let’s point `DESTDIR` to a path under the build directory rather than under "$out". This will prevent `installPhase` from creating `$out` or any other output directory, allowing us to install the outputs just by moving them out of `$DESTDIR` directly into the store with `mv`. Of course, that will also require moving the installing of `etc` and `var` after the outputs are installed and ensuring there is no library litter from `checkPhase`. Since `$out` does not currently contain `var` subdirectory, we can also just move `$DESTDIR/var` directly to `$out` rather than copying it. `$out/etc` does exist but we can just merge it with `cp --recursive` instead of `rsync` so `rsync` is not actually necessary. The code remains written defensively against files accidentally being misplaced while shuffling them around – parent directories of targets are used as `mv` destinations so that the move fails loudly if the directory already exists, rather than being moved inside as e.g. `$out/etc/etc`. While at it let’s also improve practices a bit: - Add vertical space and clearer comments. - Handle non-standard Nix store paths.
https://github.com/IsmaelMartinez/teams-for-linux/releases/tag/v1.3.23 https://github.com/IsmaelMartinez/teams-for-linux/releases/tag/v1.3.24 https://github.com/IsmaelMartinez/teams-for-linux/releases/tag/v1.3.25 https://github.com/IsmaelMartinez/teams-for-linux/releases/tag/v1.3.26 https://github.com/IsmaelMartinez/teams-for-linux/releases/tag/v1.3.27 https://github.com/IsmaelMartinez/teams-for-linux/releases/tag/v1.4.0 https://github.com/IsmaelMartinez/teams-for-linux/releases/tag/v1.4.1 Co-Authored-By: Lily Foster <[email protected]>
Otherwise, if `QT_QPA_PLATFORM=wayland`, qt based programs will segfault.
rubyPackages: update
darktile: 0.0.10 -> 0.0.11
ticktick: 1.0.80 -> 2.0.0
vscode-extensions.asvetliakov.vscode-neovim: 1.0.1 -> 1.5.0
kubectx: 0.9.4 -> 0.9.5
txtpbfmt: unstable-2023-03-28 -> unstable-2023-10-25
backblaze-b2: add missing dependency setuptools
nwjs: 0.82.0 -> 0.83.0
cheat: 4.4.0 -> 4.4.2
xsubfind3r: 0.4.0 -> 0.7.0
…s.aioguardian python310Packages.aioguardian: 2023.11.0 -> 2023.12.0
librewolf-unwrapped: 120.0.1-1 -> 121.0-1
eask: 0.8.1 -> 0.9.1
kanata: mention breaking changes of v1.5.0
nixos/no-x-libs: add intel-vaapi-driver
baresip: 3.6.0 -> 3.7.0
nixos/installation-device: remove warning about mdadm
php: 8.1.27, 8.2.14, 8.3.1
rust: set sourceProvenance for bootstrap binary
xwaylandvideobridge: 0.3.0 -> 0.4.0
…s.simplisafe-python python310Packages.simplisafe-python: 2023.10.0 -> 2023.12.0
teams-for-linux: 1.3.22 -> 1.4.1
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )