about summary refs log tree commit diff
path: root/pkgs/stdenv/generic
Commit message (Collapse)AuthorAge
* treewide: remove redundant recvolth2019-08-28
|
* Merge staging-next into stagingFrederik Rietdijk2019-08-28
|\
| * Merge pull request #66657 from danbst/pgpackages-fixesDanylo Hlynskyi2019-08-18
| |\ | | | | | | Postgresql plugins fixes
| | * stdenv/check-meta: construct name from pname and version if name unavailabledanbst2019-08-15
| | |
* | | treewide: remove redundant quotesvolth2019-08-26
| | |
* | | Merge pull request #66725 from flokli/wrapqtappshook-execFlorian Klink2019-08-18
|\ \ \ | |/ / |/| | stdenv: add isELFExec, isELFDyn, fix wrappers
| * | setup.sh introduce isELFExec, isELFDynFlorian Klink2019-08-17
| |/ | | | | | | | | | | | | | | These can be used to determine whether a ELF file with ELF header is an executable or shared library. We can't implement it in pure bash, as bash has problems with null bytes.
* / stdenv: correct cross CMAKE_SYSTEM_NAMEarcnmx2019-07-27
|/ | | | | | | As described in cmake cross instructions, CMAKE_SYSTEM_NAME should be set to "Generic" if there is no applicable OS: https://gitlab.kitware.com/cmake/community/wikis/doc/cmake/CrossCompiling#setting-up-the-system-and-toolchain
* setup.sh: add dontUnpackworldofpeace2019-07-01
|
* setup.sh: add dontConfigureworldofpeace2019-07-01
| | | | | There's already 21 occurences of this and I've expected this to exist without knowing it had no affect for a while.
* treewide: remove unused variables (#63177)volth2019-06-16
| | | | | | * treewide: remove unused variables * making ofborg happy
* Merge branch 'master' into staging-nextVladimír Čunát2019-06-05
|\ | | | | | | Hydra nixpkgs: ?compare=1523575
| * Merge pull request #60349 from matthewbauer/fix-60345Matthew Bauer2019-06-04
| |\ | | | | | | check-meta: use system tuple in platforms
| | * check-meta: use system tuple in platformsMatthew Bauer2019-04-30
| | | | | | | | | | | | Fixes #60345
* | | Merge #61179: stdenv, cacert: $NIX_SSL_CERT_FILE changesVladimír Čunát2019-05-19
|\ \ \ | |/ / |/| | | | | ... into staging
| * | stdenv: also override cert files in pure nix-shellVladimír Čunát2019-05-09
| | | | | | | | | | | | | | | | | | | | | | | | That's very much consistent with the spirit of nix-shell --pure BTW, nix 1.x shells will be always treated as pure; in that version detection isn't possible. https://github.com/NixOS/nix/commit/1bffd83e1a9c
| * | stdenv, cacert: consider $NIX_SSL_CERT_FILE in hooksVladimír Čunát2019-05-09
| | | | | | | | | | | | | | | | | | Some SSL libs don't react to $SSL_CERT_FILE. That actually makes sense to me, as we add this behavior as nixpkgs-specific, so it seems "safer" to use $NIX_*.
* | | Changelog meta entry (#60371)Michael Raskin2019-05-10
|/ / | | | | | | meta.changelog: enable, document, add for GNU Hello
* | Merge pull request #56744 from matthewbauer/macos-10-12Matthew Bauer2019-04-26
|\ \ | |/ |/| Update macOS to 10.12
| * setup.sh: make sure initialPath goes at end of HOST_PATHMatthew Bauer2019-04-26
| | | | | | | | | | | | | | We want initialPath to have lowest precedence. In addition, unset _PATH and _HOST_PATH as they shouldn’t be needed after final PATH and HOST_PATH are set.
* | Merge pull request #56555 from matthewbauer/wasmMatthew Bauer2019-04-23
|\ \ | | | | | | Initial WebAssembly/WASI cross-compilation support
| * | stdenv, compiler-rt: Compress WASI conditionalsJohn Ericson2019-04-23
| | |
| * | wasm: init cross targetMatthew Bauer2019-04-23
| |/ | | | | | | | | | | | | | | | | Adds pkgsCross.wasm32 and pkgsCross.wasm64. Use it to build Nixpkgs with a WebAssembly toolchain. stdenv/cross: use static overlay on isWasm isWasm doesn’t make sense dynamically linked.
* | Merge pull request #59755 from matthewbauer/patches-in-make-derivationMatthew Bauer2019-04-23
|\ \ | | | | | | make-derivation: put patches in all derivations
| * | make-derivation: put patches in all derivationsMatthew Bauer2019-04-16
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This puts patches in all derivations even if it unspecified by the derivation. By default it will be an empty list. This simplifies overrides, as we can now assume that patches is a valid name so that this works: self: super: { mypkg = super.pkg.overrideAttrs (o: { patches = o.patches ++ [ ./my-very-own.patch ]; }); } That is, you don’t need to provide a default "or []", make-derivation provides one for you. Unfortunately, this is a mass rebuild.
* | make-derivation.nix: minorvolth2019-04-21
| | | | | | it seems to change nothing (.platform is always there), just to be consisted with the style of other checks
* | make-derivation.nix: @matthewbauer's reviewvolth2019-04-21
| |
* | fix bootstrap when platform.gcc.arch=="skylake"volth2019-04-21
|/
* check-env: don't execute check-meta.nix 15,000 timesGraham Christensen2019-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generated from https://github.com/NixOS/nix/pull/2761: ``` ns calls ns/call - /home/grahamc/projects/github.com/NixOS/nixpkgs/pkgs/stdenv/generic/check-meta.nix:22:5 591200 15026 39.3451 + /home/grahamc/projects/github.com/NixOS/nixpkgs/pkgs/stdenv/generic/check-meta.nix:22:5 8744 308 28.3896 ``` more, generated by: ``` $ NIX_SHOW_STATS=1 NIX_COUNT_CALLS=1 nix-instantiate ./pkgs/top-level/release.nix -A unstable > before 2>&1 $ jq -r '.functions | map((.name + ":" + .file + ":" + (.line|tostring) + ":" + (.column|tostring) + " " + (.count|tostring))) | .[]' before | sort > before.list ``` applying this patch, then: ``` $ NIX_SHOW_STATS=1 NIX_COUNT_CALLS=1 nix-instantiate ./pkgs/top-level/release.nix -A unstable > after 2>&1 $ jq -r '.functions | map((.name + ":" + .file + ":" + (.line|tostring) + ":" + (.column|tostring) + " " + (.count|tostring))) | .[]' after | sort > after.list ``` and then diffing before.list and after.list to get: ``` calls - :/home/grahamc/projects/github.com/NixOS/nixpkgs/pkgs/stdenv/generic/check-meta.nix:4:1 7513 + :/home/grahamc/projects/github.com/NixOS/nixpkgs/pkgs/stdenv/generic/check-meta.nix:4:1 154 - mutuallyExclusive:/home/grahamc/projects/github.com/NixOS/nixpkgs/lib/lists.nix:658:23 7513 + mutuallyExclusive:/home/grahamc/projects/github.com/NixOS/nixpkgs/lib/lists.nix:658:23 154 - mutuallyExclusive:/home/grahamc/projects/github.com/NixOS/nixpkgs/lib/lists.nix:658:26 7513 + mutuallyExclusive:/home/grahamc/projects/github.com/NixOS/nixpkgs/lib/lists.nix:658:26 154 - onlyLicenses:/home/grahamc/projects/github.com/NixOS/nixpkgs/pkgs/stdenv/generic/check-meta.nix:21:18 15026 + onlyLicenses:/home/grahamc/projects/github.com/NixOS/nixpkgs/pkgs/stdenv/generic/check-meta.nix:21:18 308 ``` The following information is from `NIX_SHOW_STATS=1 GC_INITIAL_HEAP_SIZE=4g nix-env -f ./outpaths.nix -qaP --no-name --out-path --arg checkMeta true`: | stat | before | after | Δ | Δ% | |:---------------------------|---------------:|---------------:|:----------------|--------:| | **cpuTime** | 179.915 | 145.543 | 🡖 34.372 | -19.10% | | **envs-bytes** | 3,900,878,824 | 3,599,483,208 | 🡖 301,395,616 | -7.73% | | **envs-elements** | 214,426,071 | 185,881,709 | 🡖 28,544,362 | -13.31% | | **envs-number** | 136,591,891 | 132,026,846 | 🡖 4,565,045 | -3.34% | | **gc-heapSize** | 11,400,048,640 | 12,314,890,240 | 🡕 914,841,600 | 8.02% | | **gc-totalBytes** | 25,976,902,560 | 24,510,740,176 | 🡖 1,466,162,384 | -5.64% | | **list-bytes** | 1,665,290,080 | 1,665,290,080 | 0 | | | **list-concats** | 7,264,417 | 7,264,417 | 0 | | | **list-elements** | 208,161,260 | 208,161,260 | 0 | | | **nrAvoided** | 191,359,386 | 179,693,661 | 🡖 11,665,725 | -6.10% | | **nrFunctionCalls** | 119,665,062 | 116,348,547 | 🡖 3,316,515 | -2.77% | | **nrLookups** | 80,996,257 | 76,069,825 | 🡖 4,926,432 | -6.08% | | **nrOpUpdateValuesCopied** | 213,930,649 | 213,930,649 | 0 | | | **nrOpUpdates** | 12,025,937 | 12,025,937 | 0 | | | **nrPrimOpCalls** | 88,105,604 | 86,451,598 | 🡖 1,654,006 | -1.88% | | **nrThunks** | 196,842,044 | 175,126,701 | 🡖 21,715,343 | -11.03% | | **sets-bytes** | 7,678,425,776 | 7,285,767,928 | 🡖 392,657,848 | -5.11% | | **sets-elements** | 310,241,340 | 294,373,227 | 🡖 15,868,113 | -5.11% | | **sets-number** | 29,079,202 | 27,601,310 | 🡖 1,477,892 | -5.08% | | **sizes-Attr** | 24 | 24 | 0 | | | **sizes-Bindings** | 8 | 8 | 0 | | | **sizes-Env** | 16 | 16 | 0 | | | **sizes-Value** | 24 | 24 | 0 | | | **symbols-bytes** | 16,474,666 | 16,474,676 | 🡕 10 | 0.00% | | **symbols-number** | 376,426 | 376,427 | 🡕 1 | 0.00% | | **values-bytes** | 6,856,506,288 | 6,316,585,560 | 🡖 539,920,728 | -7.87% | | **values-number** | 285,687,762 | 263,191,065 | 🡖 22,496,697 | -7.87% | The following information is from `NIX_SHOW_STATS=1 GC_INITIAL_HEAP_SIZE=4g nix-instantiate ./nixos/release-combined.nix -A tested`: | stat | before | after | Δ | Δ% | |:---------------------------|---------------:|---------------:|:----------------|-------:| | **cpuTime** | 256.071 | 237.531 | 🡖 18.54 | -7.24% | | **envs-bytes** | 7,111,004,192 | 7,041,478,520 | 🡖 69,525,672 | -0.98% | | **envs-elements** | 346,236,940 | 339,588,487 | 🡖 6,648,453 | -1.92% | | **envs-number** | 271,319,292 | 270,298,164 | 🡖 1,021,128 | -0.38% | | **gc-heapSize** | 8,995,291,136 | 10,110,009,344 | 🡕 1,114,718,208 | 12.39% | | **gc-totalBytes** | 37,172,737,408 | 36,878,391,888 | 🡖 294,345,520 | -0.79% | | **list-bytes** | 1,886,162,656 | 1,886,163,472 | 🡕 816 | 0.00% | | **list-concats** | 6,898,114 | 6,898,114 | 0 | | | **list-elements** | 235,770,332 | 235,770,434 | 🡕 102 | 0.00% | | **nrAvoided** | 328,829,821 | 326,618,157 | 🡖 2,211,664 | -0.67% | | **nrFunctionCalls** | 240,850,845 | 239,998,495 | 🡖 852,350 | -0.35% | | **nrLookups** | 144,849,632 | 142,126,339 | 🡖 2,723,293 | -1.88% | | **nrOpUpdateValuesCopied** | 251,032,504 | 251,032,504 | 0 | | | **nrOpUpdates** | 17,903,110 | 17,903,110 | 0 | | | **nrPrimOpCalls** | 140,674,913 | 139,485,975 | 🡖 1,188,938 | -0.85% | | **nrThunks** | 294,643,131 | 288,678,022 | 🡖 5,965,109 | -2.02% | | **sets-bytes** | 9,464,322,192 | 9,456,172,048 | 🡖 8,150,144 | -0.09% | | **sets-elements** | 377,474,889 | 377,134,877 | 🡖 340,012 | -0.09% | | **sets-number** | 50,615,607 | 50,616,875 | 🡕 1,268 | 0.00% | | **sizes-Attr** | 24 | 24 | 0 | | | **sizes-Bindings** | 8 | 8 | 0 | | | **sizes-Env** | 16 | 16 | 0 | | | **sizes-Value** | 24 | 24 | 0 | | | **symbols-bytes** | 3,147,102 | 3,147,064 | 🡖 38 | -0.00% | | **symbols-number** | 82,819 | 82,819 | 0 | | | **values-bytes** | 11,147,448,768 | 10,996,111,512 | 🡖 151,337,256 | -1.36% | | **values-number** | 464,477,032 | 458,171,313 | 🡖 6,305,719 | -1.36% |
* Merge staging-next into masterFrederik Rietdijk2019-03-01
|\
| * stdenv: only set __darwinAllowLocalNetworking on darwinDaiderd Jordan2019-02-14
| | | | | | | | | | This is a darwin only nix attribute for sandbox builds, it can be ignored on other platforms to avoid unnecessary rebuilds.
* | llvm: support cross compilation with useLLVM flagMatthew Bauer2019-02-26
|/ | | | | | | | | | | | You can build (partially) with LLVM toolchain using the useLLVM flag. This works like so: nix-build -A hello --arg crossSystem '{ system = "aarch64-unknown-linux-musl"; useLLVM = true }' also don’t separate debug info in lldClang It doesn’t work currently with that setup hook. Missing build-id?
* Merge remote-tracking branch 'origin/master' into stagingMatthew Bauer2019-02-09
|\
| * make-derivation: only modify name when name is givenMatthew Bauer2019-02-04
| | | | | | | | | | | | This preserves Nix’s native error handling of missing name: error: derivation name missing
| * mkDerivation: cleaner handling of the `name` argumentVincent Laporte2019-02-01
| |
* | Merge branch 'staging-next' into stagingVladimír Čunát2019-02-01
|\ \
| * | Merge branch 'master' into staging-nextVladimír Čunát2019-02-01
| |\| | | | | | | | | | | | | | | | | | | Comments on conflicts: - llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is to build all targets, so we should be fine - some pypi hashes: they were equivalent, just base16 vs. base32
| | * Merge pull request #35884 from dtzWill/fix/man-in-outputsToInstallMatthew Bauer2019-01-31
| | |\ | | | | | | | | default to including "man" in outputsToInstall
| | | * Merge branch 'master' into fix/man-in-outputsToInstallMatthew Bauer2019-01-26
| | | |\
| | | * | default to including "man" in outputsToInstallWill Dietz2018-02-27
| | | | |
| | * | | make-derivation: fix ordering of conditionalsMatthew Bauer2019-01-28
| | | | | | | | | | | | | | | | | | | | cross should have higher precedence
| | * | | make-derivation: try to fix stdenv.cc == null conditionalMatthew Bauer2019-01-28
| | | | | | | | | | | | | | | | | | | | sometimes this gets an infinite recursion error
| | * | | make-derivation: fix position in traceMatthew Bauer2019-01-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For a long time now, tracing has been broken in Nixpkgs. So when you have an eval error you would get something like this: error: while evaluating the attribute 'buildInputs' of the derivation 'hello-2.10' at /home/mbauer/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:185:11: while evaluating 'chooseDevOutputs' at /home/mbauer/nixpkgs/lib/attrsets.nix:474:22, called from undefined position: while evaluating 'optionals' at /home/mbauer/nixpkgs/lib/lists.nix:257:5, called from /home/mbauer/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:132:17: This is coming from how Nix handles string context and how make-derivation messes with the "name" attribute. This commit should restore the old behavior so you get a nice line number like: error: while evaluating the attribute 'buildInputs' of the derivation 'hello-2.10' at /home/mbauer/nixpkgs/pkgs/applications/misc/hello/default.nix:4:3: while evaluating 'chooseDevOutputs' at /home/mbauer/nixpkgs/lib/attrsets.nix:474:22, called from undefined position: while evaluating 'optionals' at /home/mbauer/nixpkgs/lib/lists.nix:257:5, called from /home/mbauer/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:132:17: NOTE: This will still be broken for cross compilation due to the prefixes we are adding to name.
| | * | | stdenv/make-derivation: don't hide broken packagesMatthew Bauer2019-01-27
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behavior ended up breaking the handleEvalIssue functionality by hiding those packages. So something like this: $ nix-env -iA nixpkgs.zoom-us would silently fail, without telling the user how to fix it! Regardless, this "bug" should be handled in Nix - not Nixpkgs. Fixes #38952.
* | | | Merge pull request #49552 from matthewbauer/setup-dedupeMatthew Bauer2019-01-27
|\ \ \ \ | | | | | | | | | | setup.sh: avoid running the same hook twice
| * | | | setup.sh: avoid running the same hook twiceMatthew Bauer2019-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In strictDeps=false, we don’t want the same package hook to be run twice, otherwise we get duplicates in some flags. Fixes #41340
* | | | | Merge pull request #54652 from matthewbauer/shell-in-flags-arrayMatthew Bauer2019-01-27
|\ \ \ \ \ | |_|/ / / |/| | | | setup.sh: put SHELL in flagsArray
| * | | | setup.sh: put SHELL in flagsArrayMatthew Bauer2019-01-26
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | We don’t want to modify makeFlags, that is given to us by our environment. Adding to it could lead to duplicates after repeated use. Fixes #27533
* | | | stdenv: make checkInputs nativeFrederik Rietdijk2019-01-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't run the checkPhase when build != host, so we may as well make the checkInputs native. This signicantly improves the situation of Python packages when enabling strictDeps.
* | | | stdenv: prune libtool files by default (#51767)Orivej Desh (NixOS)2019-01-11
|\ \ \ \ | | | | | | | | | | See the motivation in fd97db43bcb05e37f6bb77f363f1e1e239d9de53 (#41819).
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-31 04:10:00 +0000