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.

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

Browsermob #30448

Closed
wants to merge 531 commits into from
Closed

Browsermob #30448

wants to merge 531 commits into from

Conversation

grwlf
Copy link
Contributor

@grwlf grwlf commented Oct 15, 2017

Motivation for this change

browsermob-proxy-py (a browsermob-proxy client) had poorly-named expression 'browsermob-proxy'. This patchs renames things back and adds real 'browsermob-proxy'.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

Ericson2314 and others added 30 commits September 6, 2017 14:29
cctool's as needs to be told use to use gnu as, or else we'd need a
dependency cycle between cctools and clang for this case.

In general, this is not a problem because clang uses its own integrated
assembler where possible, and gnu as otherwise.

(cherry picked from commit eb326c9)
(cherry picked from commit 8bd1a22)
Also remove -fPIC, it's included in the hardening flags by default.

(cherry picked from commit 51eafbe)
(cherry picked from commit 024b501)
(cherry picked from commit fefdc00)
Python: several fixes (2)
(cherry picked from commit aabadda)
…wrapper"

This reverts commit 0a944b3, reversing
changes made to 61733ed.

I dislike these massive stdenv changes with unclear motivation,
especially when they involve gratuitous mass renames like NIX_CC ->
NIX_BINUTILS. The previous such rename (NIX_GCC -> NIX_CC) caused
months of pain, so let's not do that again.

(cherry picked from commit ec8d41f)
(cherry picked from commit a1912c9)
(cherry picked from commit dc8b228)
(cherry picked from commit 4999aeb)
Python: several fixes (3)
(cherry picked from commit 56c56fb)
reason: build fails in hydra
Do still need this and want to maintain this @elitak?

(cherry picked from commit 382afe8)
was only used by mongodb248

(cherry picked from commit 9ee5727)
(cherry picked from commit 6f0b538)
(cherry picked from commit 6b6ffd5)
This is a security release theoretically under emgargo, but leaked by
Mageia and Fedora.

We have permission to deliver this prior to public release.

(cherry picked from commit 993a83d)
I realize that advanced users like to configure services with Nix
attrsets, but I don't think we should remove the option to use the
(configuration) language provided by upstream.

(cherry picked from commit eed14ba)
Set LD=$CC to fix this build error:

...
ExtUtils::Mkbootstrap::Mkbootstrap('blib/arch/auto/Boost/Geometry/Utils/Utils.bs')
ld -shared -O2 -L/nix/store/sgjc1147vi5hd57ck9xgck5xjkydg5lz-glibc-2.25/lib -fstack-protector-strong -o blib/arch/auto/Boost/Geometry/Utils/Utils.so buildtmp/Utils.o -lstdc++
buildtmp/Utils.o: In function `_GLOBAL__sub_I_Utils.c':
Utils.c:(.text.startup+0x1a): undefined reference to `__dso_handle'
/nix/store/yf4p5w2v4h4i8rja9zw1akp007av624j-binutils-2.28.1/bin/ld: buildtmp/Utils.o: relocation R_X86_64_PC32 against undefined hidden symbol `__dso_handle' can not be used when making a shared object
/nix/store/yf4p5w2v4h4i8rja9zw1akp007av624j-binutils-2.28.1/bin/ld: final link failed: Bad value
error building blib/arch/auto/Boost/Geometry/Utils/Utils.so from buildtmp/Utils.o at /nix/store/7q2hps69zkj501lsmvnd2ry95mmdbh80-perl-5.24.2/lib/perl5/5.24.2/ExtUtils/CBuilder/Base.pm line 321.
builder for ‘/nix/store/bdwqvgxlgcqsmlqfh0d74jkpw96p78kh-perl-Boost-Geometry-Utils-0.15.drv’ failed with exit code 2
error: build of ‘/nix/store/bdwqvgxlgcqsmlqfh0d74jkpw96p78kh-perl-Boost-Geometry-Utils-0.15.drv’ failed

(cherry picked from commit c24820d)
This reverts commit 2f5ee49.

Package is no longer broken since 460df30 was reverted.
…wnloads, fixes NixOS#25428"

This reverts commit b73e3bf.

See NixOS#29103

(cherry picked from commit c3a0c3c)
The build was failing with gcc 6.4.0; using the samee gcc6 patch Arch
Linux uses fixed the build.

This commit also refactors out the builder.sh possibly fixing the
NOGUI make flag option.

(cherry picked from commit 8b0de80)
(cherry picked from commit 226a201)
(cherry picked from commit 2164c01)
(cherry picked from commit 6df5f88)
(cherry picked from commit 14c3ce9)
(cherry picked from commit 5059db8)
markus2342 and others added 23 commits September 11, 2017 19:33
Debian also removed the package in testing when building
with gcc7.

(cherry picked from commit 55b5a94)
python.pkgs.recaptcha-client: disable broken versions
This manifests as a segfault in any applications that use the library.

(cherry picked from commit cf32537)
(cherry picked from commit 7729420)
(cherry picked from commit 7b00a6e)
(cherry picked from commit 2509b62)
Use consistent no-space style. (All documentation I've seen use no
space, and the generated section headings from the NixOS module also use
no space.)

(cherry picked from commit fc02a02)
(cherry picked from commit f87d4ac)
This updates namecoin from a legacy version from about 3 years ago
(https://github.com/namecoin/namecoin-legacy) to
the new namecoin-core.

(cherry picked from commit 8bd3664)
(cherry picked from commit 31f349d)
(cherry picked from commit 3f96615)
(cherry picked from commit a7eb2e0)
... to ensure that the filesystem where `dataDir` resides is mounted when we do initialization or upgrade.

(cherry picked from commit 4c4f73c)
…e/key

It doesn't look good when the initial admin user is named
"<hash>-gitolite-admin" and the key stored as
"<hash>-gitolite-admin.pub". Instead, make it simply "gitolite-admin"
and "gitolite-admin.pub".

(cherry picked from commit 6b9ee30)
This reverts commit 1cfe953.

No longer needed after the upgrade in 095af3e.

(cherry picked from commit ab62b7e)
- avr-gcc 5.3.0 -> 5.4.0

closes NixOS#28220

Since the packages do not share a common prefix anymore, you need
to define the current store paths in your project's Makefile.

Example for an atmega644 build:

CFLAGS += -I /nix/store/9rffxzds5crcpm76g3nr03jx0aa657cf-avr-libc-2.0.0/avr/include
CFLAGS += -B /nix/store/9rffxzds5crcpm76g3nr03jx0aa657cf-avr-libc-2.0.0/avr/lib/avr5
CFLAGS += -L /nix/store/9rffxzds5crcpm76g3nr03jx0aa657cf-avr-libc-2.0.0/avr/lib/avr5
CFLAGS += -L /nix/store/8409dj9js4i5901i63275wxdm783l0p6-avr-gcc-5.4.0/lib/gcc/avr/5.4.0/avr5

(cherry picked from commit 6a458c1)
Google publishes prebuilt tensorflow whl for python 3.4, 3.5, 3.6,
but nix expression for tensorflow only supported 3.5.
This change adds support for python-3.6.
@grwlf
Copy link
Contributor Author

grwlf commented Oct 15, 2017

Opened by mistake

@grwlf grwlf closed this Oct 15, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet