summary refs log tree commit diff
path: root/pkgs/build-support
Commit message (Collapse)AuthorAge
* Merge master into staging-nextFrederik Rietdijk2020-04-23
|\
| * Merge pull request #85799 from matthewbauer/blas-lapack-expand-docsBenjamin Hipple2020-04-22
| |\ | | | | | | BLAS/LAPACK fixup and expand docs
| | * blas,lapack: use correct name for libraryMatthew Bauer2020-04-22
| | | | | | | | | | | | To match the soname, we need to use libblas.so.3, liblapack.so.3.
* | | Merge master into staging-nextFrederik Rietdijk2020-04-22
|\| |
| * | Merge pull request #85680 from NixOS/fix-srconlyedef2020-04-21
| |\ \ | | |/ | |/| srcOnly: ignore additional arguments
| | * srcOnly: ignore additional argumentsedef2020-04-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b32a057425b337b37db41d3b4a67d39657477c05, which breaks even the most straightforward uses of srcOnly: nix-repl> srcOnly guile error: anonymous function at /home/src/nixpkgs/pkgs/build-support/src-only/default.nix:1:1 called with unexpected argument 'drvPath', at /home/src/nixpkgs/lib/customisation.nix:69:16 nix-repl> srcOnly hello error: anonymous function at /home/src/nixpkgs/pkgs/build-support/src-only/default.nix:1:1 called with unexpected argument 'drvPath', at /home/src/nixpkgs/lib/customisation.nix:69:16 Link: https://github.com/NixOS/nixpkgs/pull/80903#issuecomment-617172927
* | | Merge master into staging-nextFrederik Rietdijk2020-04-21
|\| |
| * | blas,lapack: symlink headers when using mklMatthew Bauer2020-04-21
| | | | | | | | | | | | Some of these are necessary for things like python.pkgs.numexpr
| * | blas,lapack: provide symlink for libmkl_rt.soMatthew Bauer2020-04-20
| | | | | | | | | | | | This is needed for numpy to detect mkl correctly.
| * | blas,lapack: use isILP64 instead of is64bitMatthew Bauer2020-04-20
| | | | | | | | | | | | | | | | | | | | | | | | This is a better name since we have multiple 64-bit things that could be referred to. LP64 : integer=32, long=64, pointer=64 ILP64 : integer=64, long=64, pointer=64
| * | blas,lapack: don’t patchelfMatthew Bauer2020-04-20
| |/ | | | | | | | | We have some unused RPATHs we don’t want shrunk. These are used in MKL to dlopen based on architecture.
* | Merge staging-next into stagingFrederik Rietdijk2020-04-21
|\|
| * blas: fix build on darwinSébastien Maret2020-04-19
| |
* | gnat: init at 9.3.0Lars Jellema2020-04-20
| |
* | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2020-04-18
|\|
| * Merge pull request #85468 from Ericson2314/no-dumpmachineJohn Ericson2020-04-18
| |\ | | | | | | treewide: Get rid of -dumpmachine in favor of static info
| | * treewide: Get rid of -dumpmachine in favor of static infoJohn Ericson2020-04-13
| | |
* | | Merge branch 'master' of github.com:NixOS/nixpkgs into stagingJohn Ericson2020-04-18
|\| |
| * | blas: fix buildMilan Pässler2020-04-18
| | |
* | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2020-04-17
|\| |
| * | setup-hooks/audit-blas.sh: initMatthew Bauer2020-04-17
| | | | | | | | | | | | | | | Add a simple hook that makes sure blas and lapack are linked to the right place.
| * | blas/lapack: add wrapper for “alternative”s of BLAS/LAPACK providerMatthew Bauer2020-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is based on previous work for switching between BLAS and LAPACK implementation in Debian[1] and Gentoo[2]. The goal is to have one way to depend on the BLAS/LAPACK libraries that all packages must use. The attrs “blas” and “lapack” are used to represent a wrapped BLAS/LAPACK provider. Derivations that don’t care how BLAS and LAPACK are implemented can just use blas and lapack directly. If you do care what you get (perhaps for some CPP), you should verify that blas and lapack match what you expect with an assertion. The “blas” package collides with the old “blas” reference implementation. This has been renamed to “blas-reference”. In addition, “lapack-reference” is also included, corresponding to “liblapack” from Netlib.org. Currently, there are 3 providers of the BLAS and LAPACK interfaces: - lapack-reference: the BLAS/LAPACK implementation maintained by netlib.org - OpenBLAS: an optimized version of BLAS and LAPACK - MKL: Intel’s unfree but highly optimized BLAS/LAPACK implementation By default, the above implementations all use the “LP64” BLAS and LAPACK ABI. This corresponds to “openblasCompat” and is the safest way to use BLAS/LAPACK. You may received some benefits from “ILP64” or 8-byte integer BLAS at the expense of breaking compatibility with some packages. This can be switched at build time with an override like: import <nixpkgs> { config.allowUnfree = true; overlays = [(self: super: { lapack = super.lapack.override { lapackProvider = super.lapack-reference; }; blas = super.blas.override { blasProvider = super.lapack-reference; }; })]; } or, switched at runtime via LD_LIBRARY_PATH like: $ LD_LIBRARY_PATH=$(nix-build -E '(with import <nixpkgs> {}).lapack.override { lapackProvider = pkgs.mkl; is64bit = true; })')/lib:$(nix-build -E '(with import <nixpkgs> {}).blas.override { blasProvider = pkgs.mkl; is64bit = true; })')/lib ./your-blas-linked-binary By default, we use OpenBLAS LP64 also known in Nixpkgs as openblasCompat. [1]: https://wiki.debian.org/DebianScience/LinearAlgebraLibraries [2]: https://wiki.gentoo.org/wiki/Blas-lapack-switch
* | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2020-04-13
|\| |
| * | Merge pull request #85172 from andir/buildRustCrate-proc-macroAndreas Rammhold2020-04-13
| |\ \ | | |/ | |/| buildRustCrate: support proc-macro in default prelude
| | * buildRustCrate: support proc-macro in default preludeAndreas Rammhold2020-04-13
| | |
* | | Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020Matthew Bauer2020-04-13
|\ \ \ | |/ / |/| | Cross compilation fixes [april 2020]
| * | setup-hooks/auto-patchelf.sh: get prefixed readelfMatthew Bauer2020-04-06
| | |
* | | Merge pull request #84179 from kolloch/build-rust-crate-multi-version-renameAndreas Rammhold2020-04-13
|\ \ \ | |_|/ |/| | buildRustCrate: Allow version specific dependency renaming + parameter doc
| * | buildRustCrate: Support versioned crate renamesPeter Kolloch2020-04-10
| | |
| * | buildRustCrate: Document parametersPeter Kolloch2020-04-10
| |/ | | | | | | | | | | | | | | | | I know, heretic, but... I also know that this is not perfect but it is a good start, I think. It would be nice if this were part of the automatic "nixdoc" function reference. I'd like guidance if this should be part of the rust section or something else.
* | Merge pull request #84933 from matthewbauer/fix-bazel-coptsMatthew Bauer2020-04-11
|\ \ | | | | | | build-bazel-package: fix linkopt flags
| * | build-bazel-package: fix linkopt flagsMatthew Bauer2020-04-10
| |/ | | | | | | | | | | These values were incorrect. We need to use NIX_LDFLAGS, not NIX_LD_FLAGS. Also need to prefix all flags with -Wl, for GCC to accept it.
* / treewide: Per RFC45, remove all unquoted URLsMichael Reilly2020-04-10
|/
* Merge pull request #83896 from etu/slim-down-default-php-v3Elis Hirwing2020-04-05
|\ | | | | PHP: Make the default package more sane [v3]
| * php.packages.buildPecl: Introduce built-in extension dependenciestalyz2020-04-05
| | | | | | | | | | Introduce the internalDeps attribute used by mkExtension, to refer to internal php extensions built by mkExtension.
* | Merge master into staging-nextFrederik Rietdijk2020-04-05
|\ \
| * \ Merge pull request #83112 from bhipple/dev/reltools-cleanupMatthew Bauer2020-04-04
| |\ \ | | | | | | | | releaseTools: no-op expression cleanup
| | * | releaseTools: no-op expression cleanupBenjamin Hipple2020-03-21
| | | | | | | | | | | | | | | | | | | | No functional change, was just reading through these and cleaning/sanitizing them a bit while I'm here.
* | | | Merge master into staging-nextFrederik Rietdijk2020-04-03
|\| | |
| * | | emacs: fix setup-hookRobert Helgesson2020-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes byte compilation of, e.g., Helm without breaking builds using, e.g., `trivialBuild`. See https://github.com/NixOS/nixpkgs/pull/82604#issuecomment-607201755
| * | | Merge pull request #83894 from symphorien/unbreak-os-prober-testLéo Gaspard2020-03-31
| |\ \ \ | | | | | | | | | | Unbreak os prober test
| | * | | vmTools.diskImageFuns.debian9i386: update source urlSymphorien Gibol2020-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | referenced packets were removed from the mirrors Fixes #77396 #80041
* | | | | Merge branch 'staging-next' into stagingJan Tojnar2020-03-31
|\ \ \ \ \
| * | | | | Merge branch 'master' into staging-nextJan Tojnar2020-03-31
| |\| | | |
| | * | | | makeDesktopItem: make categories optionalOrivej Desh2020-03-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Application" is deprecated, "Other" is invalid, there are no generic categories, and the Categories fields is optional per the spec. Fixes the defaults after #75729.
| | * | | | Merge pull request #75729 from worldofpeace/validate-makeDesktopItemworldofpeace2020-03-30
| | |\ \ \ \ | | | | | | | | | | | | | | makeDesktopItem: add desktop file validation
| | | * | | | makeDesktopItem: add desktop file validationworldofpeace2019-12-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This uses desktop-file-validate in desktop-file-utils. It can be turned off if wanted.
| | * | | | | skawarePackages: support static builds via pkgsStaticProfpatsch2020-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the skaware packages already build just fine with pkgsStatic, however the wrapper scripts for execline and stdnotify-wrapper needed the `-lskarlib` argument to go at the end. `utmps` and `nsss` still fail with this error: ``` exec ./tools/install.sh -D -m 600 utmps-utmpd /bin/utmps-utmpd /build/utmps-0.0.3.1/tools/install.sh: line 48: can't create /bin/utmps-utmpd.tmp.479: Permission denied make: *** [Makefile:121: /bin/utmps-utmpd] Error 1 ```
| | * | | | | buildSkawarePackage: use pname and version directlyProfpatsch2020-03-30
| | | | | | |
| | * | | | | Revert "buildSkawarePackage: pass through extra args"Profpatsch2020-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a50653295df5e2565b4a6a316923f9e939f1945b. The reasons cited were “debugging”, in which case you can just add the attribute to `buildSkawarePackage` and “customizing”, which is still possible with a normal `overrideDerivation`. The patch removed `outputs` for some reason (possible oversight), so building nsss failed. Plus lots of complexity (e.g. don’t forget to add new arguments to `removeAttrs` otherwise there’s a bug now).
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-06 23:40:07 +0000