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.

Sign up for GitHub

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

Jump to bottom

Staging next #50876

Merged
merged 160 commits into from Nov 30, 2018
Merged

Staging next #50876

merged 160 commits into from Nov 30, 2018

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Nov 21, 2018

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

volth and others added 30 commits July 10, 2018 22:47
substituteStream(): print warning if nothing done
5ff872a
@matthewbauer
Revert "Revert "patch-shebangs: respect cross compilation""
bde9909 
This reverts commit 9c4b11e.
@matthewbauer
patch-shebangs: use --build for auto patch shebangs
eb7c50a 
In strictDeps=false, autoPatchshebangs should use
--build (corresponding to PATH) to lookup commands. This restores the
previous behavior of patchshebangs so that we don’t break stuff that
isn’t careful in the buildInputs vs. nativeBuildInputs distinction.
Unfortunately this won’t work under cross compilation.
@matthewbauer
darwin/stdenv: bash is a build input
2f2e635 
patch shebangs needs to be in build inputs for it to get into
HOST_PATH.
@FRidh
Merge staging-next into staging
e1baed0
@thoughtpolice
Merge branch 'master' into staging
c55fa1e
@FRidh
Merge staging-next into staging
b95b7e4
@thoughtpolice
Merge branch 'master' into staging
be39781
@Ericson2314
Merge remote-tracking branch 'upstream/master' into HEAD
48caae5
@Synthetica9
make-derivation: use pname-version as default name if both are present
320c9c1
@Synthetica9
treewide: Fix packages using name where they should use pname
b0e9fc1
@Synthetica9
treewide: Fix overrides having wrong versions
9ec40cc
@Synthetica9
treewide: various version number fixes
f54f5fd
@Synthetica9
arm-trusted-firmware: correctly handle version overrides
0e381e0
@Synthetica9
modem-manager: don't define inconsistent pname
914392c
@Synthetica9
treewide: use unstable-date instead of hash as version
1c69e58
@Synthetica9
salut-a-toi: don't define name and pname as incompatible things
a3042c9
@Synthetica9
fetchegg: add version to derivation
0d7c994
@Synthetica9
hex: correct version handling
2449bd2
@Synthetica9
enhanced-ctorrent: follow versioning guidelines
e2ea057
@Synthetica9
metaphone: don't use capital for pname
2224d42
@Synthetica9
sphinx: don't use capital for pname
d2e6608
@Synthetica9
treewide: for substituteAll: s/version/version_/
1e99582 
This is because it gets passed to mkDerivation through some route, this ensures
that doesn't mess with anything
@zimbatm @Synthetica9
remmina: use pname instead of name
cef08f1 
Co-Authored-By: Synthetica9 <git@hilhorst.be>
@Synthetica9
vcv-rack, opkowa: pname-version fixes
c63d353
@Synthetica9
oneko: switch around version and vname
4319244 
Co-Authored-By: Synthetica9 <git@hilhorst.be>
@Synthetica9
bookworm: fix rev
b6f86df
@lsix
gnupg22: 2.2.10 -> 2.2.11
ace631b 
See http://lists.gnu.org/archive/html/info-gnu/2018-11/msg00003.html for
release information
@Mic92
Merge pull request #49769 from Synthetica9/implement-rfc0035-II
424c38b 
[WIP] Implement RFC0035 II: Electric Boogaloo
@andrew-d
ncurses: upgrade from 6.1 -> 6.1-20181027
f485b2e 
This includes fixes for CVE-2018-10754.

While we're changing things, also set the `--with-manpage-format=normal`
configure flag, which prevents the `configure` script from looking in
/usr to determine whether to compress manpages. This was already the
format on NixOS (where these directories don't exist), but making this
explicit makes the build more reproducible on other distros.
@hedning
enchant: 1.6.0 -> 1.6.1
16267b4 
hunspell-1.7.0 broke enchant-1.6, upgrading to the latest 1.6 release fixes the
problem.
@hedning
Copy link
Contributor

hedning commented Nov 21, 2018

Updating enchant-1.6 fixed the issue. Pushed directly, hope that's okay.

@jtojnar jtojnar mentioned this pull request Nov 21, 2018
Merged
9 tasks
@Mic92 Mic92 mentioned this pull request Nov 24, 2018
Merged
10 tasks
@hedning
Copy link
Contributor

hedning commented Nov 25, 2018

There's something wrong with the tarballs: https://hydra.nixos.org/build/84759686

I'm getting the same problem when trying to build a VM.

Looks like it's connected to the default pname changes @Synthetica9

@Synthetica9
Copy link
Member

@hedning #50364

@hedning
Copy link
Contributor

hedning commented Nov 26, 2018

valgrind seems to fail randomly (I've seen the same failure on staging and trunk a few times now), Tried reproducing the failure locally (with -j 4) a bunch of times, but haven't seen a failure yet. Should we just turn off parallel building (it's not a huge build so not a big loss)?

@srhb srhb mentioned this pull request Nov 26, 2018
Closed
10 tasks
@andir andir mentioned this pull request Nov 28, 2018
Merged
@srhb
Merge pull request #51107 from srhb/valgrind-coregrind-makefile-race
9caab8f 
valgrind: Apply upstream patch for Makefile race in coregrind
@Synthetica9
Copy link
Member

I've changed the base branch of #50364 from staging to staging-next, could someone give it a merge?

@hedning
Copy link
Contributor

hedning commented Nov 29, 2018

Okay, the main thing blocking staging-next is the version assert problem. There's two proposed fixes:

If #51183 is a massive rebuild (not sure how changes to mkDerivation works or if ofBorg picks them up) I'd say we should merge #50364 here first, and wait for the next merge window to add #51183. If it's not a massive rebuild I'd say we go for #51183 directly. Does that sound fair?

@hedning hedning mentioned this pull request Nov 29, 2018
Merged
10 tasks
c0bw3b and others added 3 commits November 29, 2018 23:48
@c0bw3b
brave: version is just 0.56.15
70f5d64
@FRidh
Merge master into staging-next
1828a5c
@matthewbauer @FRidh
make-derivation: remove selfConsistent check
28e2277 
version is set in lots of places but might not need to be in a name.

Alternative to #50364.
@FRidh
Copy link
Member Author

FRidh commented Nov 30, 2018

I pushed 28e2277 solving the version issue so we can merge this now.

@FRidh FRidh merged commit 2c5f92a into master Nov 30, 2018
@hedning hedning mentioned this pull request Dec 1, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edolstra edolstra Awaiting requested review from edolstra

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314 Ericson2314 is a code owner

@LnL7 LnL7 Awaiting requested review from LnL7

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@Mic92 Mic92 Awaiting requested review from Mic92 Mic92 is a code owner

@nbp nbp Awaiting requested review from nbp

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice thoughtpolice is a code owner

@zimbatm zimbatm Awaiting requested review from zimbatm

Assignees
No one assigned
Labels
6.topic: erlang 6.topic: fetch 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang 6.topic: python 6.topic: ruby 6.topic: rust 6.topic: stdenv Standard environment 8.has: clean-up 8.has: documentation 8.has: package (new) 10.rebuild-darwin: 501+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux-stdenv
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet