Skip to content

merge master into staging#36756

Merged
shlevy merged 869 commits intoNixOS:stagingfrom
oxij:merge/master-to-staging-20180310
Mar 11, 2018
Merged

merge master into staging#36756
shlevy merged 869 commits intoNixOS:stagingfrom
oxij:merge/master-to-staging-20180310

Conversation

@oxij
Copy link
Member

@oxij oxij commented Mar 10, 2018 •
edited
Loading

Motivation for this change

I want to push the rest of libcardiacarrest switch (see #35374), but it's a mass-rebuild, so I need this.

I'm sure I screwed up some of the src hashes, because some packages switched src sources. Currently building the new stdenv to check it.

  • Conflicted src build.

ryantm and others added 30 commits March 8, 2018 09:27
@ryantm
git-secret: 0.2.2 -> 0.2.3
3d90bab 
Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/5f9ki7kbirk84j77hfvs09dqlqdli79b-git-secret-0.2.3/bin/.git-secret-wrapped --version` and found version 0.2.3
- found 0.2.3 with grep in /nix/store/5f9ki7kbirk84j77hfvs09dqlqdli79b-git-secret-0.2.3
- found 0.2.3 in filename of file in /nix/store/5f9ki7kbirk84j77hfvs09dqlqdli79b-git-secret-0.2.3
@xeji
wyrd: fix build error with ncurses-6.0-abi5-compat
de1427f
@7c6f434c
Merge pull request NixOS#36531 from ryantm/auto-update/gfan
bad291e 
gfan: 0.6 -> 0.6.2
@ryantm
gitless: 0.8.5 -> 0.8.6
bdc7145 
Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6/bin/.gl-wrapped -h` got 0 exit code
- ran `/nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6/bin/.gl-wrapped --help` got 0 exit code
- ran `/nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6/bin/.gl-wrapped --version` and found version 0.8.6
- ran `/nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6/bin/gl -h` got 0 exit code
- ran `/nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6/bin/gl --help` got 0 exit code
- ran `/nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6/bin/gl --version` and found version 0.8.6
- found 0.8.6 with grep in /nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6
- found 0.8.6 in filename of file in /nix/store/49m7aj5a77km9i0npzs0v4m821nmnhks-gitless-0.8.6
@ryantm
global: 6.5.7 -> 6.6.2
7410ea3 
Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gtags --help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gtags --version` and found version 6.6.2
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/global --help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/global help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/global --version` and found version 6.6.2
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gozilla --help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gozilla --version` and found version 6.6.2
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/htags -h` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/htags --help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/htags help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/htags --version` and found version 6.6.2
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gtags-cscope -h` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gtags-cscope --help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gtags-cscope -V` and found version 6.6.2
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/gtags-cscope --version` and found version 6.6.2
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/.gtags-wrapped --help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/.gtags-wrapped help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/.gtags-wrapped --version` and found version 6.6.2
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/.global-wrapped --help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/.global-wrapped help` got 0 exit code
- ran `/nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2/bin/.global-wrapped --version` and found version 6.6.2
- found 6.6.2 with grep in /nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2
- found 6.6.2 in filename of file in /nix/store/2flw25y597pyjl1hlnkpxm86crmps6cw-global-6.6.2
@codyleyu
Upgrade Nuget version from 2.8.5 to 3.4.3
a47adc1
@ryantm
glpk: 4.64 -> 4.65
b127000 
Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65/bin/glpsol -h` got 0 exit code
- ran `/nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65/bin/glpsol --help` got 0 exit code
- ran `/nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65/bin/glpsol -v` and found version 4.65
- ran `/nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65/bin/glpsol --version` and found version 4.65
- ran `/nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65/bin/glpsol -h` and found version 4.65
- ran `/nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65/bin/glpsol --help` and found version 4.65
- found 4.65 with grep in /nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65
- found 4.65 in filename of file in /nix/store/ra315prmwpsflq6fwq5glpxq0zqa1v3y-glpk-4.65
@copumpkin
Merge pull request NixOS#36534 from codyleyu/master
51954f1 
Upgrade Nuget version from 2.8.5 to 3.4.3
@dtzWill
Merge pull request NixOS#36463 from dtzWill/fix/lldb4-gcc7
a9abec1 
lldb_4: fix w/gcc7
@dtzWill
Merge pull request NixOS#36466 from dtzWill/fix/virtualboxHeadless
4259d83 
virtualbox: drop headless patch that no longer applies, fixed upstream
@dtzWill
Merge pull request NixOS#36464 from dtzWill/fix/squishyball-ncurses
3a8d36a 
squishyball: fix w/new ncurses
@dtzWill
Merge pull request NixOS#34457 from dtzWill/feature/llvm-6
b09b557 
llvm 6: init
@dtzWill
Merge pull request NixOS#36544 from xeji/wyrd-fix-build
f468f35 
wyrd: fix build error with ncurses-6.0-abi5-compat
@dtzWill
llvmPackages_6: build using gcc6 on i686, like others.
42c33ce
@obadz
citrix-receiver: 13.8.0 -> 13.9.0
daafd1d 
The "A network error occured (SSL error 4)" is finally fixed!
@ryantm
gmsh: 3.0.5 -> 3.0.6
365a2e5 
Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.0.6 with grep in /nix/store/ha4gl4kswiq7pz4chb1ba9ixb51rcdsn-gmsh-3.0.6
- found 3.0.6 in filename of file in /nix/store/ha4gl4kswiq7pz4chb1ba9ixb51rcdsn-gmsh-3.0.6
@xeji
libreswan: fix build with gcc7
0d98016
@ryantm
gmtp: 1.3.10 -> 1.3.11
393235f 
Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.3.11 with grep in /nix/store/8lp6lwxfy7zq94jd2f26vgxc1zs0scfm-gmtp-1.3.11
- found 1.3.11 in filename of file in /nix/store/8lp6lwxfy7zq94jd2f26vgxc1zs0scfm-gmtp-1.3.11
@Lassulus
bitcoin-abc: 0.16.0 -> 0.16.2
d940c79
@ryantm
gnubg: 1.04.000 -> 1.06.001
b3d39c6 
Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/gnubg -h` got 0 exit code
- ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/gnubg --help` got 0 exit code
- ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/gnubg -v` and found version 1.06.001
- ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/gnubg --version` and found version 1.06.001
- ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/makebearoff -h` got 0 exit code
- ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/makebearoff --help` got 0 exit code
- ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/makehyper -h` got 0 exit code
- ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/makehyper --help` got 0 exit code
- ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/bearoffdump -h` got 0 exit code
- ran `/nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001/bin/bearoffdump --help` got 0 exit code
- found 1.06.001 with grep in /nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001
- found 1.06.001 in filename of file in /nix/store/6r487wa172j7yn39akgn0i1hjp2d8z4g-gnubg-1.06.001
@Lassulus
bitcoin-classic: 1.3.6 -> 1.3.8
bbd8664
@wchresta @vbgl
tamarin-prover: 1.3.0 -> 1.3.1
c6d3f0d
@LnL7
Merge pull request NixOS#36351 from LnL7/skhd
697847b 
skhd: init at 0.0.10
@LnL7
Merge pull request NixOS#30418 from LnL7/inline-set-environment
db6fb86 
nixos: inline set-environment for bash and zsh
@LnL7
libjack2: remove clang patch
f2661ed 
/cc ZHF NixOS#36454
@ryantm
gocr: 0.50 -> 0.51
8e3a310 
Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/6mm4a7nrr7ahv7wc47c137f28frhkrm5-gocr-0.51/bin/gocr --help` got 0 exit code
- ran `/nix/store/6mm4a7nrr7ahv7wc47c137f28frhkrm5-gocr-0.51/bin/gocr --help` and found version 0.51
- found 0.51 with grep in /nix/store/6mm4a7nrr7ahv7wc47c137f28frhkrm5-gocr-0.51
- found 0.51 in filename of file in /nix/store/6mm4a7nrr7ahv7wc47c137f28frhkrm5-gocr-0.51
@vbgl @dtzWill
wyrd: fix build
1d4bbef
@ryantm
google-cloud-sdk: 184.0.0 -> 190.0.1
84cb658 
Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 190.0.1 with grep in /nix/store/y7rvgsj3077w8div5qny11xhgyjvy06c-google-cloud-sdk-190.0.1
@bignaux
qmc2 : init at 0.195
a611114
@nlewo
Merge pull request NixOS#36547 from ryantm/auto-update/global
78e0fd1 
global: 6.5.7 -> 6.6.2
@GrahamcOfBorg GrahamcOfBorg added 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: steam Steam game store/launcher (store.steampowered.com) 6.topic: vim Advanced text editor 6.topic: xfce The Xfce Desktop Environment 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` labels Mar 10, 2018
@peti peti removed their request for review March 10, 2018 14:59
@oxij oxij force-pushed the merge/master-to-staging-20180310 branch from 5f08329 to f537692 Compare March 10, 2018 15:00
@GrahamcOfBorg GrahamcOfBorg added 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 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 Mar 10, 2018
@oxij
Merge branch 'master' into staging
7079e74 
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
@oxij oxij force-pushed the merge/master-to-staging-20180310 branch from f537692 to 7079e74 Compare March 10, 2018 20:38
@oxij
Copy link
Member Author

oxij commented Mar 10, 2018

@GrahamcOfBorg build systemd epoxy gtk3 python3Packages.asgiref python3Packages.daphne

@oxij
Copy link
Member Author

oxij commented Mar 10, 2018

Requesting review of the resolved conflicts from @shlevy @xeji @lsix @FRidh.

@oxij oxij changed the title [WIP] merge master into staging merge master into staging Mar 10, 2018
@oxij
Copy link
Member Author

oxij commented Mar 10, 2018

LGTM. No longer WIP.

@GrahamcOfBorg
Copy link

GrahamcOfBorg commented Mar 10, 2018

Success on x86_64-linux (full log)

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/fzs4hf0cz880mdmws3y4vbixnnj8bns4-gtk+3-3.22.28-dev
shrinking /nix/store/fzs4hf0cz880mdmws3y4vbixnnj8bns4-gtk+3-3.22.28-dev/bin/gtk-query-immodules-3.0
shrinking /nix/store/fzs4hf0cz880mdmws3y4vbixnnj8bns4-gtk+3-3.22.28-dev/bin/gtk-builder-tool
shrinking /nix/store/fzs4hf0cz880mdmws3y4vbixnnj8bns4-gtk+3-3.22.28-dev/bin/gtk-encode-symbolic-svg
shrinking /nix/store/fzs4hf0cz880mdmws3y4vbixnnj8bns4-gtk+3-3.22.28-dev/bin/gtk-query-settings
gzipping man pages under /nix/store/fzs4hf0cz880mdmws3y4vbixnnj8bns4-gtk+3-3.22.28-dev/share/man/
strip is /nix/store/y2z2g4n8dsv0isjq36cjn9ldp8h9z3gs-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/fzs4hf0cz880mdmws3y4vbixnnj8bns4-gtk+3-3.22.28-dev/lib  /nix/store/fzs4hf0cz880mdmws3y4vbixnnj8bns4-gtk+3-3.22.28-dev/bin 
patching script interpreter paths in /nix/store/fzs4hf0cz880mdmws3y4vbixnnj8bns4-gtk+3-3.22.28-dev
checking for references to /tmp/nix-build-gtk+3-3.22.28.drv-0 in /nix/store/fzs4hf0cz880mdmws3y4vbixnnj8bns4-gtk+3-3.22.28-dev...

@xeji
Copy link
Contributor

xeji commented Mar 10, 2018

pkgs/development/libraries/epoxy/default.nix LGTM.

@GrahamcOfBorg
Copy link

GrahamcOfBorg commented Mar 10, 2018

Success on aarch64-linux (full log)

Partial log (click to expand)

gzipping man pages under /nix/store/xixyabhd06g78yxw0jxp9hsg6h88jry2-gtk+3-3.22.28-dev/share/man/
strip is /nix/store/fib7s4bkwwh54jz3b9yhb3sqmlcdks0n-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/xixyabhd06g78yxw0jxp9hsg6h88jry2-gtk+3-3.22.28-dev/lib  /nix/store/xixyabhd06g78yxw0jxp9hsg6h88jry2-gtk+3-3.22.28-dev/bin
patching script interpreter paths in /nix/store/xixyabhd06g78yxw0jxp9hsg6h88jry2-gtk+3-3.22.28-dev
checking for references to /build in /nix/store/xixyabhd06g78yxw0jxp9hsg6h88jry2-gtk+3-3.22.28-dev...
/nix/store/6i8vby3isp29dg4kr0dvizkia1ynwf3w-systemd-237
/nix/store/4b561rwsn4rjp2j0mazszldj7a1w9lp3-epoxy-1.5.0
/nix/store/9bcla3zsicha9aaflb968zrqx78mrc2n-gtk+3-3.22.28
/nix/store/d92cz4pwcr2igz9lrd4kbqahfsyxc6j4-python3.6-asgiref-2.2.0
/nix/store/j5zqn3apnhc5gq1bgmsc08gmzjcaisxl-python3.6-daphne-2.1.0

@FRidh
Copy link
Member

FRidh commented Mar 11, 2018

Thanks. Paths with conflicts:

        both modified:   pkgs/development/libraries/epoxy/default.nix
        both modified:   pkgs/development/libraries/gtk+/3.x.nix
        both modified:   pkgs/development/python-modules/asgiref/default.nix
        both modified:   pkgs/development/python-modules/daphne/default.nix
        both modified:   pkgs/os-specific/linux/systemd/default.nix

The Python modules look fine.

@shlevy @aszlig can you check the merge of systemd?

@aszlig
Copy link
Member

aszlig commented Mar 11, 2018

@FRidh: 👍 - Diffed against a rebase and the contents of systemd/default.nix match with the contents of the merge commit.

@shlevy
Copy link
Member

shlevy commented Mar 11, 2018

Will merge at the sooner of @lsix's positive review or a day.

@lsix
Copy link
Member

lsix commented Mar 11, 2018

Hi all, sorry for the delay.

I have checked and tested the parts I am involved with. Everything is fine for me.

@shlevy you can merge when you like.

@shlevy shlevy merged commit 7079e74 into NixOS:staging Mar 11, 2018
@oxij oxij deleted the merge/master-to-staging-20180310 branch September 8, 2018 22:18
@c0bw3b c0bw3b mentioned this pull request Oct 14, 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

@edwtjo edwtjo Awaiting requested review from edwtjo

@FRidh FRidh Awaiting requested review from FRidh

@nbp nbp Awaiting requested review from nbp

@rycee rycee Awaiting requested review from rycee

@ttuegel ttuegel Awaiting requested review from ttuegel

@zimbatm zimbatm Awaiting requested review from zimbatm

Assignees

No one assigned

Labels

6.topic: emacs Text editor 6.topic: erlang General-purpose, concurrent, functional high-level programming language 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: steam Steam game store/launcher (store.steampowered.com) 6.topic: vim Advanced text editor 6.topic: xfce The Xfce Desktop Environment 8.has: changelog This PR adds or changes release notes 8.has: clean-up This PR removes packages or removes other cruft 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.