Graham Bennett
b12605563f
Fix handling of lists in whitelistedLicenses and blacklistedLicenses
...
A package's meta.license can either be a single license or a list. The
code to check config.whitelistedLicenses and config.blackListedLicenses
wasn't handling this, nor was the showLicense function.
2019-10-27 10:23:53 +00:00
Matthew Bauer
8e9b98a183
Merge pull request #69028 from matthewbauer/remove-iselfexec-iselfdyn
...
Revert "setup.sh introduce isELFExec, isELFDyn"
2019-09-20 23:26:48 -04:00
Matthew Bauer
d8b7b95ac6
Merge remote-tracking branch 'origin/master' into staging
2019-09-20 23:25:24 -04:00
Albert Safin
42482a1d60
setup.sh: avoid subshells: iterating a file
2019-09-20 02:45:53 +00:00
Albert Safin
cf4e4820f6
setup.sh: avoid subshells: type -t in _callImplicitHook
2019-09-20 02:45:52 +00:00
Albert Safin
d53920a5be
setup.sh: avoid subshells: mapOffset
2019-09-20 02:45:52 +00:00
Albert Safin
6f024f6e65
setup.sh: avoid subshells: type -t
2019-09-20 02:45:52 +00:00
Matthew Bauer
07d78691da
stdenv/adapters.nix: remove static from makeStaticLibraries
...
This logic should be in the pkgs/top-level/static.nix. We don’t want
to pollute Nixpkgs with =if stdenv.static=. Also, "static" is not
descriptive. We have two types of static stdenvs, ‘makeStaticLibaries’
and ‘makeStaticBinaries’. We shouldn’t rely on a static boolean like
this.
2019-09-19 12:52:28 -04:00
Albert Safin
463463b395
setup.sh: avoid subshells: shopt -po nounset
2019-09-19 09:54:29 +00:00
Matthew Bauer
24c6aef75a
Revert "setup.sh introduce isELFExec, isELFDyn"
...
This reverts commit e1b80a5a99
.
This is broken in PIE (#68513 ). Best to not keep it in until something
else starts using it.
2019-09-18 11:28:27 -04:00
Vladimír Čunát
f21211ebfe
Merge branch 'master' into staging
2019-09-02 23:25:24 +02:00
John Ericson
c33d80c071
Merge remote-tracking branch 'upstream/master' into feature/js-unknown-ghcjs
2019-09-02 01:31:31 -04:00
Moritz Angermann
446f8c851d
Add support for js-unknown-ghcjs
...
This adds enough logic to nixpkgs to support the `js-unknown-ghcjs` triple.
2019-09-02 01:27:05 -04:00
volth
08f68313a4
treewide: remove redundant rec
2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c
Merge staging-next into staging
2019-08-28 08:26:42 +02:00
volth
35d68ef143
treewide: remove redundant quotes
2019-08-26 21:40:19 +00:00
Danylo Hlynskyi
2ca09a94be
Merge pull request #66657 from danbst/pgpackages-fixes
...
Postgresql plugins fixes
2019-08-18 17:30:56 +03:00
Florian Klink
dbd7ea5f29
Merge pull request #66725 from flokli/wrapqtappshook-exec
...
stdenv: add isELFExec, isELFDyn, fix wrappers
2019-08-18 13:58:10 +02:00
Florian Klink
e1b80a5a99
setup.sh introduce isELFExec, isELFDyn
...
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.
2019-08-17 16:45:52 +02:00
danbst
cd5b8620bb
stdenv/check-meta: construct name from pname and version if name unavailable
2019-08-15 02:25:56 +03:00
Matthew Bauer
166905cb31
Merge pull request #65484 from arcnmx/pr-stdenv-cmake-cross
...
stdenv: correct cross CMAKE_SYSTEM_NAME
2019-08-14 10:17:12 -04:00
Frederik Rietdijk
55e4555b77
Merge master into staging-next
2019-08-01 09:42:54 +02:00
arcnmx
8cedc7fc6c
stdenv: correct cross CMAKE_SYSTEM_NAME
...
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
2019-07-27 15:23:31 -07:00
Tobias Mayer
bb71bb15ce
pkgsStatic: propagate all buildInputs
2019-07-24 16:04:51 +02:00
Tobias Mayer
3c12ae1d35
Signal static build option in makeStaticLibraries
...
This flag can replace the extra static parameter to packages that
don't work automatically with this adapter.
2019-07-21 06:44:50 +02:00
Daiderd Jordan
f1070eec27
stdenv: MACOSX_DEPLOYMENT_TARGET 10.10 -> 10.12
2019-07-08 21:56:40 +02:00
worldofpeace
4a88f4ebfc
setup.sh: add dontUnpack
2019-07-01 04:23:51 -04:00
worldofpeace
0197c05786
setup.sh: add dontConfigure
...
There's already 21 occurences of this and I've
expected this to exist without knowing it had no affect for a while.
2019-07-01 01:52:54 -04:00
volth
f3282c8d1e
treewide: remove unused variables ( #63177 )
...
* treewide: remove unused variables
* making ofborg happy
2019-06-16 19:59:05 +00:00
Vladimír Čunát
576af17187
Merge branch 'master' into staging-next
...
Hydra nixpkgs: ?compare=1523575
2019-06-05 11:06:44 +02:00
Matthew Bauer
760c9995b0
Merge pull request #60349 from matthewbauer/fix-60345
...
check-meta: use system tuple in platforms
2019-06-04 11:29:48 -04:00
Vladimír Čunát
b4ae841b23
Merge branch 'staging-next' into staging
2019-05-26 09:48:55 +02:00
Vladimír Čunát
96a604320a
Merge #61179 : stdenv, cacert: $NIX_SSL_CERT_FILE changes
...
... into staging
2019-05-19 10:56:11 +02:00
Matthew Bauer
5ba633970b
Merge pull request #61169 from matthewbauer/meson-static
...
static: set default_library flag for meson in makeStaticLibrary
2019-05-18 15:02:33 -05:00
Robin Gloster
6cf583cf2f
Merge pull request #60406 from JohnAZoidberg/remove-isnull
...
treewide: Remove usage of isNull
2019-05-18 09:36:24 +00:00
Michael Raskin
76e2a96475
Changelog meta entry ( #60371 )
...
meta.changelog: enable, document, add for GNU Hello
2019-05-10 16:55:29 +00:00
Vladimír Čunát
b27cc37671
stdenv: also override cert files in pure nix-shell
...
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
2019-05-09 09:49:42 +02:00
Vladimír Čunát
79bd4ad579
stdenv, cacert: consider $NIX_SSL_CERT_FILE in hooks
...
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_*.
2019-05-09 08:46:22 +02:00
Matthew Bauer
fea2422398
static: set default_library flag for meson in makeStaticLibrary
...
Adds support for building static libraries with meson.
2019-05-08 21:52:59 -04:00
Matthew Bauer
424f467e06
Merge branch 'master' into update-ios-gnu-config
2019-05-07 14:25:33 -04:00
Matthew Bauer
5a69a4ecc1
cross: use newer gnu-config on iOS
2019-05-07 13:36:25 -04:00
Matthew Bauer
a52e317200
check-meta: use system tuple in platforms
...
Fixes #60345
2019-04-30 12:59:03 -04:00
Daniel Schaefer
786f02f7a4
treewide: Remove usage of isNull
...
isNull "is deprecated; just write e == null instead" says the Nix manual
2019-04-29 14:05:50 +02:00
Matthew Bauer
87944c3125
Merge pull request #56744 from matthewbauer/macos-10-12
...
Update macOS to 10.12
2019-04-26 22:20:03 -04:00
Matthew Bauer
f1461d8c3d
darwin-bootstrap: copy libLLVM dylib
...
This is needed for the bootstrap tools to work:
https://hydra.nixos.org/build/92534667
2019-04-26 21:55:09 -04:00
Matthew Bauer
c1cb58e81e
darwin/make-bootstrap-tools: fix build
2019-04-26 21:55:02 -04:00
Matthew Bauer
2b0b63c229
stdenv/darwin: use libxml2-nopython for building llvm
2019-04-26 21:54:50 -04:00
Matthew Bauer
037f62bbad
stdenv/darwin: put bash in extraBuildInputs
...
patch-shebangs should pick these up as they are runtime dependencies.
This avoids bootstrap-tools leaking into the outputs.
2019-04-26 21:54:49 -04:00
Matthew Bauer
ec7d72a57d
setup.sh: make sure initialPath goes at end of HOST_PATH
...
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.
2019-04-26 21:54:49 -04:00
Matthew Bauer
2ecc1d1599
stdenv/darwin: move secure-format patch to gnum4
...
This is the only derivation that needs it anymore.
2019-04-26 21:54:47 -04:00