Staging next by FRidh · Pull Request #50876 · NixOS/nixpkgs

FRidh · 2018-11-21T11:45:07Z

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.

This reverts commit 9c4b11e.

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.

patch shebangs needs to be in build inputs for it to get into HOST_PATH.

This is because it gets passed to mkDerivation through some route, this ensures that doesn't mess with anything

Co-Authored-By: Synthetica9 <git@hilhorst.be>

See http://lists.gnu.org/archive/html/info-gnu/2018-11/msg00003.html for release information

[WIP] Implement RFC0035 II: Electric Boogaloo

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.

hunspell-1.7.0 broke enchant-1.6, upgrading to the latest 1.6 release fixes the problem.

hedning · 2018-11-21T16:19:31Z

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

Upstream bug: curl/curl#3218. This causes nixos/tests/ipv6.nix to fix since the last staging merge.

hedning · 2018-11-25T14:52:28Z

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 · 2018-11-25T15:02:03Z

@hedning #50364

hedning · 2018-11-26T17:06:40Z

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)?

valgrind: Apply upstream patch for Makefile race in coregrind

Synthetica9 · 2018-11-28T20:51:11Z

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

hedning · 2018-11-29T20:01:39Z

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

There's nixos-version: use version_ instead of version #50364 which replaces version with _version in nixos-version's derivation attrs.
@matthewbauer made Fix breaking changes to make-derivation #51183 to fix the problem in general with less backward compatibility breakage.

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?

version is set in lots of places but might not need to be in a name. Alternative to #50364.

FRidh · 2018-11-30T17:03:27Z

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

volth and others added 30 commits July 10, 2018 22:47

substituteStream(): print warning if nothing done

5ff872a

Revert "Revert "patch-shebangs: respect cross compilation""

bde9909

This reverts commit 9c4b11e.

darwin/stdenv: bash is a build input

2f2e635

patch shebangs needs to be in build inputs for it to get into HOST_PATH.

Merge staging-next into staging

e1baed0

Merge branch 'master' into staging

c55fa1e

Merge staging-next into staging

b95b7e4

Merge branch 'master' into staging

be39781

Merge remote-tracking branch 'upstream/master' into HEAD

48caae5

make-derivation: use pname-version as default name if both are present

320c9c1

treewide: Fix packages using name where they should use pname

b0e9fc1

treewide: Fix overrides having wrong versions

9ec40cc

treewide: various version number fixes

f54f5fd

arm-trusted-firmware: correctly handle version overrides

0e381e0

modem-manager: don't define inconsistent pname

914392c

treewide: use unstable-date instead of hash as version

1c69e58

salut-a-toi: don't define name and pname as incompatible things

a3042c9

fetchegg: add version to derivation

0d7c994

hex: correct version handling

2449bd2

enhanced-ctorrent: follow versioning guidelines

e2ea057

metaphone: don't use capital for pname

2224d42

sphinx: don't use capital for pname

d2e6608

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

remmina: use pname instead of name

cef08f1

Co-Authored-By: Synthetica9 <git@hilhorst.be>

vcv-rack, opkowa: pname-version fixes

c63d353

oneko: switch around version and vname

4319244

Co-Authored-By: Synthetica9 <git@hilhorst.be>

bookworm: fix rev

b6f86df

gnupg22: 2.2.10 -> 2.2.11

ace631b

See http://lists.gnu.org/archive/html/info-gnu/2018-11/msg00003.html for release information

Merge pull request #49769 from Synthetica9/implement-rfc0035-II

424c38b

[WIP] Implement RFC0035 II: Electric Boogaloo

GrahamcOfBorg added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Nov 21, 2018

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.

jtojnar mentioned this pull request Nov 21, 2018

fwupd: 1.1.2 -> 1.2.1 #48519

Merged

9 tasks

FRidh and others added 3 commits November 22, 2018 09:57

Merge master into staging-next

c31cb57

curl: cherry-pick upstream patch for ipv6 url parsing

90720d0

Upstream bug: curl/curl#3218. This causes nixos/tests/ipv6.nix to fix since the last staging merge.

Merge master into staging-next

e41154d

Mic92 mentioned this pull request Nov 24, 2018

Rustfmt: 0.9.0 -> 0.99.5 #50960

Merged

10 tasks

Merge branch 'master' into staging-next

a5de78b

srhb mentioned this pull request Nov 26, 2018

valgrind: Disable parallel building #51082

Closed

10 tasks

srhb and others added 2 commits November 27, 2018 12:45

valgrind: Apply upstream patch for Makefile race in coregrind

a067e88

libtiff: 2018-11-04 -> 4.0.10

ac3b358

GrahamcOfBorg added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 28, 2018

andir mentioned this pull request Nov 28, 2018

[staging-18.09] backport nss, libpng & sqlite updates #50963

Merged

Merge pull request #51107 from srhb/valgrind-coregrind-makefile-race

9caab8f

valgrind: Apply upstream patch for Makefile race in coregrind

Merge master into staging-next

9db2421

GrahamcOfBorg removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 29, 2018

hedning mentioned this pull request Nov 29, 2018

balsa: switch from enchant to gtkspell3 #51254

Merged

10 tasks

c0bw3b and others added 3 commits November 29, 2018 23:48

brave: version is just 0.56.15

70f5d64

Merge master into staging-next

1828a5c

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 merged commit 2c5f92a into master Nov 30, 2018

hedning mentioned this pull request Dec 1, 2018

mythes: doesn't build on master #51297

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Staging next#50876

Staging next#50876
FRidh merged 160 commits intomasterfrom
staging-next

FRidh commented Nov 21, 2018

Uh oh!

hedning commented Nov 21, 2018

Uh oh!

hedning commented Nov 25, 2018

Uh oh!

Synthetica9 commented Nov 25, 2018

Uh oh!

hedning commented Nov 26, 2018

Uh oh!

Synthetica9 commented Nov 28, 2018

Uh oh!

hedning commented Nov 29, 2018

Uh oh!

FRidh commented Nov 30, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

19 participants

Uh oh!

Conversation

FRidh commented Nov 21, 2018

Motivation for this change

Things done

Uh oh!

hedning commented Nov 21, 2018

Uh oh!

hedning commented Nov 25, 2018

Uh oh!

Synthetica9 commented Nov 25, 2018

Uh oh!

hedning commented Nov 26, 2018

Uh oh!

Synthetica9 commented Nov 28, 2018

Uh oh!

hedning commented Nov 29, 2018

Uh oh!

FRidh commented Nov 30, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

19 participants