167849 Commits

Author SHA1 Message Date
Bruce Toll
bbb2f93cee wrap-gapps-hook.sh: only wrap links when required
Unless dontWrapGapps is set, the wrap-gapps-hook.sh will currently
wrap all executables (and symbolic links to executables) found under
the target directories: bin and libexec.

As a result, if a symbolic link in a target directory points to an
executable in a target directory, both will get wrapped.  This
causes an extra shell/exec when following the symbolic link,
as well as increasing the size of the final executable's environment.

To avoid wrapping a link to an already wrapped executable, this
commit splits the determination of what gets wrapped into two phases:

1. All binaries under the target directories are wrapped and logged
   with "Wrapping program ..."

2. All links to executables under the target directories are
   identified and checked to see if they reference an executable
   under one of the target directories.

   If yes, the required wrapping has already been performed on
   the associated binary (in phase 1), so no wrapping is done
   and "Not wrapping link: ... (already wrapped)" is logged.

   If no, the link points at an executable that hasn't been
   wrapped, so the link is wrapped and "Wrapping link: ..." is logged.

As an example, the yelp package has a bin directory that contains
an executable "yelp" and a symbolic link "gnome-help" -> "yelp".

Prior to this commit, the bin directory would contain these files
after wrapping:

  gnome-help          -- wrapper to exec .gnome-help-wrapped
  .gnome-help-wrapped -- a symbolic link to yelp
  yelp                -- wrapper to exec .yelp-wrapped
  .yelp-wrapped       -- the original yelp binary

After this commit, the bin directory will instead contain:

  gnome-help          -- a symbolic link to yelp
  yelp                -- wrapper to exec .yelp-wrapped
  .yelp-wrapped       -- the original yelp binary

NOTE: The primary motivation for this commit is to avoid obscuring
the fact that two or more paths are simple aliases and expected to
behave identically. It also reduces the likelihood of hitting
limits related to environment variable size.

LIMITATION: The method used above is intended to be conservative
and will still wrap symbolic links to other symbolic links when
the ultimate target is outside of bin or libexec.
2019-01-31 20:14:30 -05:00
Alyssa Ross
2183d3167e
Merge commit 'refs/pull/53622/head' of https://github.com/NixOS/nixpkgs into staging 2019-01-31 20:00:30 +00:00
Will Dietz
442a74bdf8
Merge pull request #54998 from dtzWill/fix/llvm7-optional-round-2
llvm7: replace patch with official upstream commit
2019-01-31 13:44:40 -06:00
Will Dietz
636ae80940 llvm7: replace patch with official upstream commit
Hopefully this also addresses any problems enountered
with the patch used previously.
2019-01-31 10:24:37 -06:00
worldofpeace
ed63bd949d gtksourceview4: cleanup 2019-01-29 20:18:03 -05:00
worldofpeace
750c27f432 gtksourceview: cleanup 2019-01-29 20:18:03 -05:00
worldofpeace
bb509ab087 gtksourceview4: set XDG_DATA_DIRS for testing, fix build 2019-01-29 20:17:45 -05:00
Will Dietz
b3792fa893 gtksourceview: set XDG_DATA_DIRS for testing
Fixes #54894
2019-01-29 19:41:59 -05:00
worldofpeace
77a716fcd9 pantheon.wingpanel-indicator-power: 2.1.3 -> 2.1.4 2019-01-29 19:37:46 -05:00
worldofpeace
1e8a8f1050 pantheon.wingpanel-indicator-network: 2.2.1 -> 2.2.2 2019-01-29 19:37:45 -05:00
worldofpeace
744de1c8b9 pantheon.switchboard-plug-power: 2.3.4 -> 2.3.5 2019-01-29 19:37:44 -05:00
worldofpeace
ae2813bde8 pantheon.switchboard-plug-bluetooth: 2.2.0 -> 2.2.1 2019-01-29 19:37:44 -05:00
worldofpeace
a249e75f74 pantheon.switchboard-plug-applications: 2.1.4 -> 2.1.5 2019-01-29 19:37:43 -05:00
worldofpeace
29ae094829 pantheon.elementary-photos: 2.6.1 -> 2.6.2 2019-01-29 19:37:43 -05:00
worldofpeace
50b83e7b6a nixos/pantheon: use gnome3.file-roller 2019-01-29 19:37:41 -05:00
Vladimír Čunát
79a7cd6c55
syslinux: fix build with new binutils
Also fix the URL of the other patch.
2019-01-29 22:18:49 +01:00
Vladimír Čunát
34a936340f
Merge #54878: bison: 3.3 -> 3.3.1
This mainly fixes some build-regressions from 3.3,
so we can drop the workarounds.
2019-01-29 15:00:06 +01:00
Vladimír Čunát
57a456112d
Revert "swig3, libapparmor: switch to bison2"
This reverts commit c4720cb200bfa611dc1800aa046c9cb7f1e6c0df.
2019-01-29 12:54:20 +01:00
Vladimír Čunát
444d073332
Revert "glibc: fix build with newer bison"
This reverts commit aa9821bbb9ce1085205eeb01bcfe3529617ed712.
2019-01-29 12:54:04 +01:00
Vladimír Čunát
efc836f607
Merge branch 'staging' into bison-3.3.1 2019-01-29 12:52:57 +01:00
Vladimír Čunát
c4720cb200
swig3, libapparmor: switch to bison2
To fix build after https://github.com/NixOS/nixpkgs/pull/54635
2019-01-29 12:42:27 +01:00
Vladimír Čunát
aa9821bbb9
glibc: fix build with newer bison
Fixes https://github.com/NixOS/nixpkgs/issues/54870
2019-01-29 12:42:26 +01:00
Peter Simons
1283c19098
Merge pull request #54862 from r-ryantm/auto-update/apache-httpd
apacheHttpd: 2.4.37 -> 2.4.38
2019-01-29 10:19:50 +01:00
Will Dietz
2b59e4edd6
Merge pull request #54731 from dtzWill/update/meson-0.49.1
meson: 0.49.0 -> 0.49.1
2019-01-28 21:25:06 -06:00
Will Dietz
f235d64b18
Merge pull request #54635 from dtzWill/update/bison-3.3
bison: 3.2.4 -> 3.3.1
2019-01-28 21:24:33 -06:00
R. RyanTM
61bcf59e1d apacheHttpd: 2.4.37 -> 2.4.38
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apache-httpd/versions
2019-01-28 17:32:40 -08:00
Jörg Thalheim
6f6900495d
Merge pull request #54323 from lblasc/rust132
rust: 1.31.0 -> 1.32.0
2019-01-28 16:14:57 +00:00
Matthew Bauer
d54fbbebbb
Merge pull request #49552 from matthewbauer/setup-dedupe
setup.sh: avoid running the same hook twice
2019-01-27 18:22:41 -05:00
Matthew Bauer
9172c1eee2 setup.sh: avoid running the same hook twice
In strictDeps=false, we don’t want the same package hook to be run
twice, otherwise we get duplicates in some flags.

Fixes #41340
2019-01-27 17:49:13 -05:00
Will Dietz
8657f25239
Merge pull request #54711 from dtzWill/update/gnutls-3.6.6
gnutls: 3.6.5 -> 3.6.6
2019-01-27 16:41:11 -06:00
Will Dietz
5aaf597df3 meson: 0.49.0 -> 0.49.1
https://groups.google.com/d/msg/mesonbuild/xRXQatmXIwo/-2lqsOIXGAAJ

https://github.com/mesonbuild/meson/milestone/33
2019-01-27 15:28:01 -06:00
Will Dietz
4fe53f33a6 gnutls: drop comment, no longer needed 2019-01-27 14:59:58 -06:00
Will Dietz
096ef4f297
Merge pull request #54442 from dtzWill/update/go-1.9.7
go: 1.9.5 -> 1.9.7
2019-01-27 13:29:44 -06:00
Will Dietz
49dbc7bebb
Merge pull request #54444 from dtzWill/update/plasma5-5.14.5
plasma-5: 5.14.4 -> 5.14.5
2019-01-27 13:18:50 -06:00
Will Dietz
644aedbd64
Merge pull request #54446 from dtzWill/update/kde-frameworks-5.54
kde-frameworks: 5.53 -> 5.54
2019-01-27 13:17:37 -06:00
Will Dietz
8b1e5308ba
Merge pull request #54464 from dtzWill/fix/binutils-2.31.1-musl
binutils: unbreak w/musl via upstream commits
2019-01-27 13:15:27 -06:00
Matthew Bauer
bd62ac6b88
Merge pull request #54652 from matthewbauer/shell-in-flags-array
setup.sh: put SHELL in flagsArray
2019-01-27 13:55:54 -05:00
Matthew Bauer
bb3683d778
Merge pull request #54624 from matthewbauer/libcxx
cc-wrapper: add libcxx for libcxxClang
2019-01-27 13:55:18 -05:00
Will Dietz
5eca7642ad gnutls: 3.6.5 -> 3.6.6
"bug fix release on the stable branch"

https://lists.gnupg.org/pipermail/gnutls-help/2019-January/004484.html
2019-01-27 10:48:15 -06:00
Will Dietz
5ef89ae605 bison: 3.3 -> 3.3.1
https://lists.gnu.org/archive/html/bison-announce/2019-01/msg00003.html
2019-01-27 10:26:13 -06:00
Matthew Bauer
92f0f8dd68 Merge remote-tracking branch 'NixOS/master' into staging 2019-01-27 00:01:13 -05:00
R. RyanTM
4866cbe341 tortoisehg: 4.8.1 -> 4.8.2 (#54651)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tortoisehg/versions
2019-01-27 06:41:29 +02:00
Domen Kožar
8441a62c3c
Merge pull request #54478 from Izorkin/datadog-agent
datadog-agent: 6.8.3 -> 6.9.0
2019-01-27 10:54:46 +07:00
Matthew Bauer
77550df8e6 cc-wrapper: add libcxx for libcxxClang
clang needs to find headers + libraries for compiling with libc++. We
need to add a libcxx argument to cc-wrapper. This means you do not
have to pass in c++ headers directly.

This resolves the last case remaining of #30670. Darwin clang++ now
works properly.

Fixes #30670
2019-01-26 22:45:15 -05:00
Tim Steinbach
43c6a83041
conky: journal support 2019-01-26 22:14:10 -05:00
Matthew Bauer
329913f733 setup.sh: put SHELL in flagsArray
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
2019-01-26 21:14:36 -05:00
Matthew Bauer
319ebef3a3 Revert "Merge pull request #36948 from dtzWill/fix/glibc-libgcc_s"
This reverts commit 80ff19a45f40ddb3a3c55dbd929295fcb946eabb, reversing
changes made to 43e867a226a8dc5c9c968aeae1c526697c71cd32.
2019-01-26 20:36:42 -05:00
Michael Raskin
cc74c0399e leo3: init at 1.2 2019-01-27 01:57:11 +01:00
Silvan Mosberger
d79ec45ebe
Merge pull request #54224 from utdemir/add-asciiquarium
asciiquarium: init at 1.1
2019-01-27 01:20:21 +01:00
Utku Demir
2004af94f7
asciiquarium: init at 1.1 2019-01-27 13:11:41 +13:00