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 #76875

Merged
merged 43 commits into from
Jan 6, 2020
Merged

Staging next #76875

merged 43 commits into from
Jan 6, 2020
+306 −138

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Jan 3, 2020

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

Sorry, something went wrong.

flokli and others added 30 commits December 22, 2019 17:35
@flokli @lheckemann
systemd: add flokli to maintainers
b3d99bf
@flokli @lheckemann
systemd: v243.3 -> v243.4
fef59ca
@tobim
zstd: build with CMake
c06a0b2 
CMake is used for static builds because the Makefile does not
offer a way to disable the shared library.
@tobim
double-conversion: add pkgsStatic support
15fb93a
@tobim
glog: add pkgsStatic support
d567c7e
@tobim
gflags: add pkgsStatic support
93da24c
@tobim
gtest: add pkgsStatic support
812ccd8
@tobim
woff2: add pkgsStatic support
0aeacde
@tobim
snappy: add pkgsStatic support
a244885
@jtojnar
glib: remove Autotools specific env vars
e4da685 
Even upstream no longer ships Autotools build files.
@jtojnar
glibc: make NIX_CFLAGS_COMPILE a string
95a1614
@r-ryantm @FRidh
bison: 3.4.2 -> 3.5
d6a5d28
@zowoq @FRidh
file: 5.37 -> 5.38
25fb1a0
@equirosa @FRidh
vim: 8.1.2407 -> 8.2.0013
3e50d4a
@r-ryantm @FRidh
man: 2.8.7 -> 2.9.0
c93355b
@risicle @FRidh
cyrus_sasl: add patch for CVE-2019-19906
302a77a 
sourced from debian as patch isn't even in upstream master yet.
@tobim
thrift: build with CMake; add pkgsStatic support
0a21b32
@tobim
arrow-cpp: add pkgsStatic support
207db01
@tobim
arrow-cpp: add lib parameter
cdbf3f7
@tobim
openblas: partially fix static build
db5d3cd
@dtzWill
llvmPackages_9: 9.0.0 -> 9.0.1
21b0162 
Fetch from github release page,
as that's where https://releases.llvm.org/9.0.1 redirects.
@dtzWill
clang_9: fix unpackPhase
dc0c28a
@flokli
Merge pull request #76134 from mayflower/systemd-v243.4
b33e1a6 
Systemd v243.4
@FRidh
Merge staging-next into staging
62bfa88
@FRidh
Merge pull request #75798 from tobim/pkgsStatic/arrow
960c24a 
arrow-cpp: add pkgsStatic support
@FRidh
apr: fix static musl build
016111e
@costrouc
pythonPackages.svgwrite: refactor fix broken build
6e02629 
There was a single test in the build that tries to download a google
font.
@LnL7
Merge pull request #76771 from dtzWill/update/llvm-9.0.1
dd5fd3b 
llvm_9: 9.0.0 -> 9.0.1
@FRidh
openblas: fix static musl build
8675529
@FRidh
python: numpy: 1.17.4 -> 1.17.5
64015f4
@FRidh
Copy link
Member Author

FRidh commented Jan 3, 2020

@adisbladis please do not merge new updates after branching and evaluation.

@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 5, 2020
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 5, 2020
@FRidh FRidh merged commit 3cf2c4c into master Jan 6, 2020
FRidh added a commit that referenced this pull request Sep 27, 2020
@FRidh
pkgsStatic.fmt: don't build shared libs
759a281 
The change in `static.nix` was added in
#76875 but apparently
`enabledShared` got removed in the master/staging-next merge.
FRidh added a commit that referenced this pull request Sep 27, 2020
@FRidh
pkgsStatic.fmt: don't build shared libs
d4a8eb2 
The change in `static.nix` was added in
#76875 but apparently
`enabledShared` got removed in the master/staging-next merge.

(cherry picked from commit 759a281)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer

@matthewbauer matthewbauer

Assignees
No one assigned
Labels
6.topic: python 6.topic: vim 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv This PR causes stdenv to rebuild
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet