Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

stdenv: enable __structuredAttrs #72074

Draft
wants to merge 1,781 commits into
base: staging
from
Draft

stdenv: enable __structuredAttrs #72074

wants to merge 1,781 commits into from

Conversation

@globin
Copy link
Member

globin commented Oct 27, 2019

__structuredAttrs is a nice feature, we want it enabled in stdenv!

hydra jobset: https://hydra.nixos.org/jobset/nixpkgs/structured-attrs

related: NixOS/rfcs#13

Further information: https://nixos.mayflower.consulting/blog/2020/01/20/structured-attrs/

cc @Ericson2314 @matthewbauer


LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib));
LIBRARY_PATH = toString (optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)));

This comment has been minimized.

Copy link
@volth

volth Oct 27, 2019

Contributor

makeLibraryPath returns string, so why toString and not just

- LIBRARY_PATH = toString (optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)));
+ LIBRARY_PATH = optionalString (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib));
@jtojnar

This comment has been minimized.

Copy link
Contributor

jtojnar commented Oct 30, 2019

Why not make the NIX_*_FLAGS be lists as well?

@globin

This comment has been minimized.

Copy link
Member Author

globin commented Oct 30, 2019

They need to be exported to be picked up by bintools-/cc-wrapper

@Ericson2314

This comment has been minimized.

Copy link
Member

Ericson2314 commented Oct 30, 2019

@globin we could require that they be lists, but then convert to strings (and quote!) ourselves. If that is not more churn, I think i might prefer that.

@Ericson2314 Ericson2314 mentioned this pull request Oct 31, 2019
2 of 2 tasks complete
@Ericson2314

This comment has been minimized.

Copy link
Member

Ericson2314 commented Nov 2, 2019

I added set -u as I got that ready/pretty close, and ensured at least stdenv built after the merge. Also fixed an eval failure.

marsam and others added 17 commits Jan 21, 2020
maintainers: add sdier
rofi-mpd: 2.0.0 -> 2.0.1
flow: 0.114.0 -> 0.116.1
bshapr: 0.6 -> 0.7
dyncall: 1.0 -> 1.1
tmuxinator: 1.1.0 -> 1.1.4
saldl: init at 40
home-assistant: add icloud support
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
…coreapi

Packages for the python coreapi client
toot: 0.24.0 -> 0.25.0
flexget: 3.0.31 -> 3.1.10
unit: 1.13.0 -> 1.14.0
@nixos-discourse

This comment has been minimized.

Copy link

nixos-discourse commented Jan 27, 2020

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/nixos-20-03-feature-freeze/5655/1

@globin globin modified the milestones: 20.03, 20.09 Jan 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.