summary refs log tree commit diff
path: root/pkgs/build-support
Commit message (Collapse)AuthorAge
* Merge branch 'master' into staging-nextVladimír Čunát2018-08-12
|\ | | | | | | Hydra: ?compare=1472947
| * Merge pull request #44870 from symphorien/tests-evalxeji2018-08-10
| |\ | | | | | | Fix evaluation of two tests
| | * nixos/tests/hocker-fetchdocker: fix evaluationSymphorien Gibol2018-08-10
| | | | | | | | | | | | it still does not build
| | * Revert "Merge #44221: default for NIX_CXXSTDLIB_COMPILE"Vladimír Čunát2018-07-31
| | | | | | | | | | | | | | | | | | This reverts commit 034c9816d5236e5c0131b715ee08fed56c89d4ad, reversing changes made to 5afe87ed7a75e99c3b68f255562dc82b3e3c7d4e. Huge rebuild, moving to staging.
| | * Use the default for NIX_CXXSTDLIB_COMPILE even if defined (but empty).Eduard-Mihai Burtescu2018-07-30
| | |
* | | bintools-wrapper: propagated-build-inputs -> propagated-user-env-packagesEelco Dolstra2018-08-09
| | |
* | | Revert "cc-wrapper: propagate man and info to propagated-build-inputs"Eelco Dolstra2018-08-09
| | | | | | | | | | | | This reverts commit 28ad0703f3db92a3cbb8b1249101e0ff4e3616f6.
* | | Revert "cc-wrapper, bintools-wrapper: simply symlink man and info outputs"Eelco Dolstra2018-08-09
| | | | | | | | | | | | This reverts commit 02c09e01712ce0b61e5c8f7159047699a434f7fc.
* | | cc-wrapper, bintools-wrapper: simply symlink man and info outputsJan Malakhovski2018-08-06
| | | | | | | | | | | | See discussion in #44516.
* | | cc-wrapper: propagate man and info to propagated-build-inputsJan Malakhovski2018-08-05
|/ /
* | Re-Revert "Merge #44221: default for NIX_CXXSTDLIB_COMPILE"Vladimír Čunát2018-07-31
| | | | | | | | | | This reverts commit fd81a2ecb6b85594dc79ad53566c822849d4e47a. Moved from master to staging.
* | stdenv/build-support: support .tbz and .txz tarballsJames Deikun2018-07-30
|/
* remove file that was accidentally addedFrederik Rietdijk2018-07-29
|
* {cc,bintools}-wrapper: also replace . in configMatthew Bauer2018-07-28
| | | | | Some configs will have dots for version numbers. To normalize we can just use _ again.
* dockerTools.pullImage: control OS and architectureNick Novitski2018-07-27
|
* Fix pname to ename propagation if nullPeriklis Tsirakidis2018-07-27
|
* systems: Allow detection of powerpc and sparcJohn Q Crosscompiler2018-07-26
|
* php: get rid of composableDerivationFrederik Rietdijk2018-07-26
| | | | | | | Some bugs may have creeped in during the conversion. One flag I had trouble with and so removed was: "--enable-embedded-mysqli"
* buildMaven: Check for authenticated attributeLorenzo Manacorda2018-07-25
| | | | | | | | | The `authenticated` attribute is not always present in the `project-info.json` produced by maven2nix[0] We therefore check for its presence, and default it to false. [0]: https://github.com/NixOS/mvn2nix-maven-plugin/issues/5#issuecomment-311846950
* Merge staging-next into master (#44009)Frederik Rietdijk2018-07-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * substitute(): --subst-var was silently coercing to "" if the variable does not exist. * libffi: simplify using `checkInputs` * pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix * utillinux: 2.32 -> 2.32.1 https://lkml.org/lkml/2018/7/16/532 * busybox: 1.29.0 -> 1.29.1 * bind: 9.12.1-P2 -> 9.12.2 https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html * curl: 7.60.0 -> 7.61.0 * gvfs: make tests run, but disable * ilmbase: disable tests on i686. Spooky! * mdds: fix tests * git: disable checks as tests are run in installcheck * ruby: disable tests * libcommuni: disable checks as tests are run in installcheck * librdf: make tests run, but disable * neon, neon_0_29: make tests run, but disable * pciutils: 3.6.0 -> 3.6.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions. * mesa: more include fixes mostly from void-linux (thanks!) * npth: 1.5 -> 1.6 minor bump * boost167: Add lockfree next_prior patch * stdenv: cleanup darwin bootstrapping Also gets rid of the full python and some of it's dependencies in the stdenv build closure. * Revert "pciutils: use standardized equivalent for canonicalize_file_name" This reverts commit f8db20fb3ae382eba1ba2b160fe24739f43c0bd7. Patching should no longer be needed with 3.6.1. * binutils-wrapper: Try to avoid adding unnecessary -L flags (cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9) Signed-off-by: Domen Kožar <domen@dev.si> * libffi: don't check on darwin libffi usages in stdenv broken darwin. We need to disable doCheck for that case. * "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook * python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273 When `py.test` was run with a folder as argument, it would not only search for tests in that folder, but also create a .pytest-cache folder. Not only is this state we don't want, but it was also causing collisions. * parity-ui: fix after merge * python.pkgs.pytest-flake8: disable test, fix build * Revert "meson: 0.46.1 -> 0.47.0" With meson 0.47.0 (or 0.47.1, or git) things are very wrong re:rpath handling resulting in at best missing libs but even corrupt binaries :(. When we run patchelf it masks the problem by removing obviously busted paths. Which is probably why this wasn't noticed immediately. Unfortunately the binary already has a long series of paths scribbled in a space intended for a much smaller string; in my testing it was something like lengths were 67 with 300+ written to it. I think we've reported the relevant issues upstream, but unfortunately it appears our patches are what introduces the overwrite/corruption (by no longer being correct in what they assume) This doesn't look so bad to fix but it's not something I can spend more time on at the moment. -- Interestingly the overwritten string data (because it is scribbled past the bounds) remains in the binary and is why we're suddenly seeing unexpected references in various builds -- notably this is is the reason we're seeing the "extra-utils" breakage that entirely crippled NixOS on master (and probably on staging before?). Fixes #43650. This reverts commit 305ac4dade5758c58e8ab1666ad0197fd305828d. (cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d) Signed-off-by: Domen Kožar <domen@dev.si>
* melpaBuild: use Emacs package names to satisfy package-buildThomas Tuegel2018-07-23
| | | | | | | | | | package-build expects the recipe file name to match the Emacs package name. `melpaBuild` takes an extra argument `ename` for the Emacs package name (default: `pname`, the Nix package name) which is used to name the recipe file. Fixes: #43893 See also: #43609
* Merge branch 'master' into unused5Jörg Thalheim2018-07-21
|\
| * [bot] treewide: remove unused 'inherit' in let blocksvolth2018-07-20
| |
* | pkgs/*: remove unreferenced function argumentsvolth2018-07-21
|/
* Merge pull request #43857 from volth/unusedFrederik Rietdijk2018-07-20
|\ | | | | [bot] treewide: remove unreferenced code
| * [bot]: remove unreferenced codevolth2018-07-20
| |
* | Merge pull request #43538 from timokau/fetchpatch-fixMatthew Bauer2018-07-19
|\ \ | | | | | | fetchpatch: quote excludes
| * | fetchpatch: add option to revert a patchTimo Kaufmann2018-07-16
| | |
| * | fetchpatch: fail on empty patchTimo Kaufmann2018-07-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this is probably never the desired case and has led to actual issues, see the comments at: https://github.com/NixOS/nixpkgs/commit/af1313e91552e42a4419b396b3026319c60fc17f This might also happen when pulling a patch from GitHub or a similar web interface without explicitly selecting the "raw" format.
| * | fetchpatch: escape excludes and includesTimo Kaufmann2018-07-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Excludes and includes are implemented by passing the parameters to the respective flags of `filterdiff`. Those were passed unescaped until now. Since those flags expect patterns (similar to shell globs), something like `/some/path/*` might be used to exclude or include all files in some path. Without escaping the shell would expand the `*`, leading to unexpected behaviour.
| * | fetchpatch: Add includes to compliment excludes, and require that both not ↵John Ericson2018-07-15
| | | | | | | | | | | | | | | | | | | | | | | | be non-empty. This commit was originally introduced as part of #41420 and then reverted with the rest of that PR. However there was no reason to revert his particular commit.
* | | treewide: remove aliases in nixpkgsMatthew Bauer2018-07-18
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the command ‘nix-env -qa -f. --arg config '{skipAliases = true;}'’ work in Nixpkgs. Misc... - qtikz: use libsForQt5.callPackage This ensures we get the right poppler. - rewrites: docbook5_xsl -> docbook_xsl_ns docbook_xml_xslt -> docbook_xsl diffpdf: fixup
* | vmTools: Fix BusyBox runtime error in initrdaszlig2018-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the recent update of BusyBox to version 1.29.0 in d6aa506e3baa3565eb375bbf8a4e68c3e3134ec9 there is now a new dependency on libresolv. This now throws a runtime error when executing ash, eg. whenever we do something like this: nix-build -E 'with import ./. {}; vmTools.runInLinuxVM hello' The resulting error will be: .../ash: error while loading shared libraries: libresolv.so.2: cannot open shared object file: No such file or directory I tried to override BusyBox with enableStatic, but that still requires parts of glibc: Static linking against glibc, can't use --gc-sections Trying libraries: crypt m resolv Library crypt is not needed, excluding it Library m is needed, can't exclude it (yet) Library resolv is needed, can't exclude it (yet) Library m is needed, can't exclude it (yet) Library resolv is needed, can't exclude it (yet) Final link with: m resolv In the long term maybe switching to a more minimal C library such as musl would make more sense, but for now I just added libresolv.so to the initrd which fixes the runtime error. Signed-off-by: aszlig <aszlig@nix.build> Cc: @edolstra, @rbvermaa Signed-off-by: aszlig <aszlig@nix.build>
* | Merge pull request #43609 from ttuegel/emacs-packages-2018-07-14Thomas Tuegel2018-07-17
|\ \ | | | | | | Emacs package updates
| * | emacsPackagesNg: 2018-07-15 updateThomas Tuegel2018-07-15
| |/ | | | | | | | | | | | | All package sets are simultaneously updated to accommodate changes to package-build. Due to new restrictions in package-build, all packages using `melpaBuild` must now provide a recipe file, even those packages which are not included in upstream MELPA.
* | Merge master into staging-nextFrederik Rietdijk2018-07-16
|\ \
| * | autoPatchelfHook: Run after patchelf's setup hookaszlig2018-07-16
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far the runtimeDependencies variable has been rather useless unless you also set dontPatchelf, because the patchelf setup hook ran *after* the autoPatchelfHook and thus stripped off the additional RPATHs added using runtimeDependencies. I did this by moving the autoPatchelfHook to be run in postFixup instead of fixupOutput, however I needed to replicate the for loop that runs the hook on all outputs. Until we have a way to influence order of execution for hooks I've marked this with an XXX so that we can use fixupOutput again. Tested this against all packages that use autoPatchelfHook using the following and checking whether the output contains any errors concerning shared libraries: nix-build -E 'with import ./. { config.allowUnfree = true; }; runCommand "test-executables" { drvs = [ masterpdfeditor franz zoom-us anydesk teamviewer maxx oracle-instantclient cups-kyodialog3 virtlyst powershell ]; } "for i in $drvs; do for b in $i/bin/*; do \"$b\" || :; done; done" ' Signed-off-by: aszlig <aszlig@nix.build> Fixes: https://github.com/NixOS/nixpkgs/issues/43082 Cc: @Ericson2314
* | Merge branch 'master' into staging-nextVladimír Čunát2018-07-14
|\| | | | | | | Hydra: ?compare=1468896
| * bazel-deps: init at 2018-05-31 (#43018)Uri Baghin2018-07-09
| |
| * dockerTools.examples: explicitly set image tag to fix docker-tools testsAntoine Eiche2018-07-06
| | | | | | | | | | | | docker-tools tests load images without specifying any tag value. Docker then uses the image with tag "latest" which doesn't exist anymore since commit 39e678e24e38f1f374eaf5463b424ebdf75df9af.
| * dockerTools.buildImage: add option to use nix output hash as tagMathias Schreck2018-07-06
| |
| * Merge pull request #42851 from jmitchell/fix/vm-debianMatthew Bauer2018-07-05
| |\ | | | | | | vmTools: update Debian minor version to 8.11
| | * vmTools: update Debian minor version to 8.11Jacob Mitchell2018-07-01
| | |
| * | Revert "haskell generic-builder: Use strictDeps always"Peter Simons2018-07-04
| | |
| * | fetchpatch: Add includes to compliment excludes, and require that both not ↵John Ericson2018-07-02
| | | | | | | | | | | | be non-empty.
* | | Merge pull request #42887 from matthewbauer/libsecurity-closure-reductionsMatthew Bauer2018-07-02
|\| | | | | | | | Libsecurity closure reductions
| * | buildRustCrate: Add some commentary about target_os.Shea Levy2018-07-02
| | |
| * | Merge branch 'feature/fix-build-rust-create-darwin' of ↵Shea Levy2018-07-02
| |\ \ | | |/ | |/| | | | | | | | | | git://github.com/marsam/nixpkgs Set target_os properly on darwin.
| | * buildRustCrate: Set target_os to "macos" on darwinMario Rodas2018-02-23
| | | | | | | | | | | | | | | | | | The rust compiler uses "macos" as "target_os" conditional on Mac OS[1] [1] https://github.com/rust-lang/rust/blob/8e7a609e635b728eba65d471c985ab462dc4cfc7/src/librustc_back/target/x86_64_apple_darwin.rs#L29
* | | Merge branch 'master' into stagingVladimír Čunát2018-07-02
|\| | | | | | | | | | | This apparently fixes some broken src fetches (gnuradio, twisted).