Commit graph

159745 commits

Author SHA1 Message Date
aszlig
9f23a63f79
autoPatchelfHook: Fix type of norecurse variable
While declaring it as an array doesn't do any harm in our usage, it
might be a bit confusing when reading the code.

Signed-off-by: aszlig <aszlig@nix.build>
2018-11-26 01:13:59 +01:00
aszlig
2faf905f98
autoPatchelfHook: Add addAutoPatchelfSearchPath
This function is useful if autoPatchelf is invoked during some of the
phases of a build and allows to add arbitrary shared objects to the
search path.

So far the same functionality was in autoPatchelf itself, but not
available as a separate function, so when adding shared objects to the
dependency cache one would have to do so manually.

The function also has the --no-recurse flag, which prevents recursing
into subdirectories.

Signed-off-by: aszlig <aszlig@nix.build>
2018-11-25 16:22:32 +01:00
aszlig
503b41b9b2
doc/stdenv: Document autoPatchelfHook changes
First of all, this makes the existing documentation a bit more clear on
what autoPatchelfHook is all about, because after discussing with
@svanderburg - who wrote a similar implementation - the rationale about
autoPatchelfHook wasn't very clear in the documentation.

I also added the recent changes around being able to use autoPatchelf
manually and the new --no-recurse flag.

Signed-off-by: aszlig <aszlig@nix.build>
2018-11-20 00:11:31 +01:00
aszlig
3ca35ce0b2
autoPatchelfHook: Add --no-recurse flag
This is to be used with the autoPatchelf command and allows to only
patch a specific file or directory without recursing into
subdirectories.

Apart from being able to run the command in a standalone way, as
detailled in the previous commit this is also needed for the Android SDK
emulator, because according to @svanderburg there are subdirectories we
don't want to patch.

The reason why I didn't use GNU getopt is that it might not be available
on all operating systems and the getopts bash builtin doesn't support
long arguments. Apart from that, the implementation for recognizing the
flag is pretty trivial and it's also using bash builtins only, so if we
want to do something really fancy someday, we can still change it.

Signed-off-by: aszlig <aszlig@nix.build>
2018-11-20 00:11:29 +01:00
aszlig
e4fbb244ee
autoPatchelfHook: Allow to prevent automatic run
If you want to only run autoPatchelf on a specific path and leave
everything else alone, we now have a $dontAutoPatchelf environment
variable, which causes the postFixup hook to not run at all.

The name "dontAutoPatchelf" probably is a bit weird in conjunction with
putting "autoPatchelfHook" in nativeBuildInputs, but unless someone
comes up with a better name I keep it that way because it's consistent
with all the other dontStrip, dontPatchShebangs, dontPatchELF and
whatnot.

A specific example where this is needed is when building the Android SDK
emulator, which contains a few ARM binaries in subdirectories that
should not be patched. If we were to run autoPatchelf on all outputs
unconditionally we'd run into errors because some ARM libraries couldn't
be found.

Signed-off-by: aszlig <aszlig@nix.build>
2018-11-20 00:07:38 +01:00
aszlig
d03e4ffdbf
autoPatchelfHook: Make easier to run autoPatchelf
The autoPatchelf main function which is run against all of the outputs
was pretty much tailored towards this specific setup-hook and was
relying on $prefix to be set globally.

So if you wanted to run autoPatchelf manually - let's say during
buildPhase - you would have needed to run it like this:

  prefix=/some/directory autoPatchelf

This is now more intuitive and all you need to do is run the following:

  autoPatchelf /some/directory

Signed-off-by: aszlig <aszlig@nix.build>
2018-11-19 17:18:27 +01:00
Edmund Wu
3ae0407d3c linux_testing: 4.20-rc2 -> 4.20-rc3 2018-11-19 14:23:16 +00:00
R. RyanTM
41c0a46021 kotlin: 1.3.0 -> 1.3.10
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kotlin/versions
2018-11-19 14:22:57 +00:00
Robert Hensing
9020edcf86
Merge pull request #50676 from alapshin/patch-1
Fix typo in nixpkgs manual
2018-11-19 15:19:09 +01:00
Jörg Thalheim
2200a805f2
Merge pull request #50716 from r-ryantm/auto-update/jruby
jruby: 9.2.1.0 -> 9.2.4.0
2018-11-19 12:42:01 +00:00
Jörg Thalheim
471c2cb7b6
Merge pull request #50460 from dotlambda/zfs-0.7.12
linuxPackages.{spl,zfs}: 0.7.11 -> 0.7.12
2018-11-19 12:34:59 +00:00
R. RyanTM
0f1fd834e9 jruby: 9.2.1.0 -> 9.2.4.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jruby/versions
2018-11-19 04:23:36 -08:00
Jan Tojnar
3e2378bc45
Merge pull request #50654 from r-ryantm/auto-update/pulseeffects
pulseeffects: 4.3.9 -> 4.4.0
2018-11-19 13:13:24 +01:00
Michael Weiss
b53a60087d scdoc: 1.5.2 -> 1.6.0 2018-11-19 12:09:45 +01:00
Jörg Thalheim
47b677e216
jflex: run correct hooks in installCheckPhase 2018-11-19 10:56:36 +00:00
Jörg Thalheim
350aea8932
Merge pull request #50681 from r-ryantm/auto-update/mtools
mtools: 4.0.19 -> 4.0.20
2018-11-19 10:24:46 +00:00
R. RyanTM
079b01dbd7 ntl: 11.3.1 -> 11.3.2 (#50680)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ntl/versions
2018-11-19 11:23:46 +01:00
Jörg Thalheim
47a239a240
mtools: fix darwin build 2018-11-19 10:19:19 +00:00
Orivej Desh
6daa1938b6 movit: 1.5.1 -> 1.6.2, fix build after #49310
Fixes #49883
2018-11-19 10:05:52 +00:00
Jörg Thalheim
ef521db578
Merge pull request #50688 from r-ryantm/auto-update/neo4j
neo4j: 3.4.9 -> 3.4.10
2018-11-19 09:55:14 +00:00
Jörg Thalheim
5ad46ce1d6
Merge pull request #50631 from layus/tmp/jflex
Update jflex urls, and version by the way
2018-11-19 09:51:20 +00:00
Jörg Thalheim
01502a04e5
jflex: add smoke test 2018-11-19 09:50:29 +00:00
Renaud
ec3d3fc2e7
Merge pull request #50650 from r-ryantm/auto-update/protozero
protozero: 1.6.3 -> 1.6.4
2018-11-19 10:46:46 +01:00
Guillaume Maudoux
02212e1d02 jflex: 1.6.1 -> 1.7.0 2018-11-19 10:17:44 +01:00
Guillaume Maudoux
33326bee7f jflex: use new source url 2018-11-19 10:17:39 +01:00
Franz Pletz
1ff57b6eca
Merge pull request #50691 from stesie/init-jid
jid: init at 0.7.2
2018-11-19 09:12:32 +00:00
Vincent Laporte
c4cad8cfa7 coqPackages.bignums: enable for Coq version 8.9 2018-11-19 08:47:34 +00:00
Stefan Siegl
e87904b83c
jid: init at 0.7.2 2018-11-19 09:36:09 +01:00
R. RyanTM
eb61876a78 neo4j: 3.4.9 -> 3.4.10
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/neo4j/versions
2018-11-19 00:22:54 -08:00
R. RyanTM
4f99f26f9b mtools: 4.0.19 -> 4.0.20
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mtools/versions
2018-11-18 23:18:55 -08:00
Andrei Lapshin
e198f9e42f
Fix typo in nixpkgs manual 2018-11-19 09:09:02 +03:00
R. RyanTM
950c515294 pulseeffects: 4.3.9 -> 4.4.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pulseeffects/versions
2018-11-18 17:09:24 -08:00
Matthew Bauer
0925c482c8
Merge pull request #50556 from oxij/pkgs/curl-cleanup
curl: move option defaults from `all-packages.nix` to the derivation itself
2018-11-18 18:25:36 -06:00
R. RyanTM
513315a472 protozero: 1.6.3 -> 1.6.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/protozero/versions
2018-11-18 16:20:46 -08:00
Renaud
7f1943bee5
Merge pull request #50622 from r-ryantm/auto-update/python3.6-jsonref
python36Packages.jsonref: 0.1 -> 0.2
2018-11-19 01:02:21 +01:00
Renaud
5f80e41538
Merge pull request #50632 from r-ryantm/auto-update/python3.6-Flask-Cors
python36Packages.flask-cors: 3.0.6 -> 3.0.7
2018-11-19 00:59:35 +01:00
qfjp
a6ddb1f666 git-latexdiff: 1.1.2 -> 1.3.0
* git-latexdiff: v1.1.2 -> v1.3.0  (#50217)

* git-latexdiff: refresh meta
Homepage is https://gitlab.com/git-latexdiff/git-latexdiff
License is BSD 3-Clause
2018-11-19 00:56:02 +01:00
Renaud
487235e2f0
Merge pull request #50635 from r-ryantm/auto-update/python3.6-confluent-kafka
python36Packages.confluent-kafka: 0.11.5 -> 0.11.6
2018-11-19 00:49:33 +01:00
Renaud
98cf5f46e8
Merge pull request #50640 from r-ryantm/auto-update/python3.6-google-api-core
python36Packages.google_api_core: 1.5.0 -> 1.5.2
2018-11-19 00:48:48 +01:00
Renaud
7f84561cc3
Merge pull request #49631 from janikrabe/master
oidentd: 2.2.2 -> 2.3.1
2018-11-19 00:31:02 +01:00
Jörg Thalheim
f26b325400
Merge pull request #50589 from r-ryantm/auto-update/python3.6-redis
python36Packages.redis: 2.10.6 -> 3.0.1
2018-11-18 23:23:19 +00:00
R. RyanTM
4b55459323 xosview2: 2.2.2 -> 2.3.0
* xosview2: 2.2.2 -> 2.3.0  (#50533)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xosview2/versions

* xosview2: fix licenses
https://sourceforge.net/p/xosview/git/ci/v2.3.0/tree/COPYING
2018-11-19 00:12:34 +01:00
R. RyanTM
39b0773e95 python36Packages.google_api_core: 1.5.0 -> 1.5.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.6-google-api-core/versions
2018-11-18 15:09:04 -08:00
Renaud
ee32dda03b
Merge pull request #50541 from r-ryantm/auto-update/stgit
gitAndTools.stgit: 0.18 -> 0.19
2018-11-19 00:03:05 +01:00
R. RyanTM
c8eaf885d3 python36Packages.qtawesome: 0.5.1 -> 0.5.2
* python36Packages.qtawesome: 0.5.1 -> 0.5.2 (#50603)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.6-qtawesome/versions

*  pythonPackages.qtawesome: linux platforms only
2018-11-18 23:49:30 +01:00
Renaud
a493b60c74
Merge pull request #50582 from r-ryantm/auto-update/python3.6-uproot-methods
python36Packages.uproot-methods: 0.2.6 -> 0.2.7
2018-11-18 23:48:32 +01:00
Renaud
29fa506332
Merge pull request #50578 from r-ryantm/auto-update/python3.6-uproot
python36Packages.uproot: 3.2.6 -> 3.2.12
2018-11-18 23:48:19 +01:00
Jörg Thalheim
bf41830376
Merge pull request #50601 from r-ryantm/auto-update/python3.6-pytest-timeout
python36Packages.pytest-timeout: 1.3.2 -> 1.3.3
2018-11-18 22:46:57 +00:00
Renaud
1145aa8c22
Merge pull request #50600 from r-ryantm/auto-update/python3.6-pyhomematic
python36Packages.pyhomematic: 0.1.50 -> 0.1.51
2018-11-18 23:46:38 +01:00
Renaud
a0758c888b
Merge pull request #50586 from r-ryantm/auto-update/python3.6-transaction
python36Packages.transaction: 2.3.0 -> 2.4.0
2018-11-18 23:45:21 +01:00