Skip to content

treewide: structured-attrs fixes#76674

Merged
jtojnar merged 15 commits intoNixOS:masterfrom
jtojnar:structured-attrs-masterable
Dec 30, 2019
Merged

treewide: structured-attrs fixes#76674
jtojnar merged 15 commits intoNixOS:masterfrom
jtojnar:structured-attrs-masterable

Conversation

@jtojnar
Copy link
Member

@jtojnar jtojnar commented Dec 30, 2019

Some fixes from #72074
that can probably go to master.

@jtojnar
cadence: Do not use DESTDIR
6dcf1a3 
NixOS#65718
@jtojnar
smu: Do not use DESTDIR
db89a2c 
NixOS#65718
@jtojnar
libsForQt5.phonon-backend-gstreamer: remove DESTDIR
0ea38bd 
Originally introduced in 128901e,
it no longer appears to be necessary.
@jtojnar
osm2xmap: clean up
86d3c33 
Do not use DESTDIR and bring makeFlags more in line with the Makefile:
https://github.com/sembruk/osm2xmap/blob/a5f9ceadf0b06c034850fb22c55f2be4dd43eaef/Makefile
@jtojnar
xbomb: clean up
814dcd9 
Use makeFlags instead of patching Makefile
@jtojnar
xawtv: clean up
9a338f2 
* Remove unnecessary linker and compiler flags
* Listify makeFlags
* Do not use DESTDIR (nasty)
* Let generic builder set --prefix configureFlag
* Install X11 app-defaults to more modern directory
* Format with nixpkgs-fmt
@ofborg ofborg bot added 6.topic: emacs Text editor 6.topic: erlang General-purpose, concurrent, functional high-level programming language 6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. and removed 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Dec 30, 2019
@Ma27 Ma27 requested review from Ericson2314, Ma27 and globin December 30, 2019 02:59
Ericson2314
Ericson2314 approved these changes Dec 30, 2019
View reviewed changes
Copy link
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

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

Thanks!!

@jtojnar jtojnar force-pushed the structured-attrs-masterable branch from 04e3e8f to 318e1ee Compare December 30, 2019 03:51
@jtojnar jtojnar merged commit ea4da9b into NixOS:master Dec 30, 2019
@jtojnar jtojnar deleted the structured-attrs-masterable branch December 30, 2019 03:53
@ConnorBaker ConnorBaker mentioned this pull request Sep 13, 2024
Open
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Ericson2314 Ericson2314 Ericson2314 approved these changes

@adisbladis adisbladis Awaiting requested review from adisbladis

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@globin globin Awaiting requested review from globin

@Ma27 Ma27 Awaiting requested review from Ma27

Assignees

No one assigned

Labels

6.topic: emacs Text editor 6.topic: erlang General-purpose, concurrent, functional high-level programming language 6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jtojnar @Ericson2314 @globin