Commit graph

153764 commits

Author SHA1 Message Date
Jan Tojnar aba011fe71
Merge pull request #47305 from worldofpeace/qgnome
Add adwaita-qt & qgnomeplatform
2018-09-25 10:16:53 +02:00
Jörg Thalheim 39f20a672e
Merge pull request #47310 from aneeshusa/clean-up-vagrant-Gemfile
vagrant: Clean up Gemfile
2018-09-25 09:02:45 +01:00
Will Dietz c82ac80d99
Merge pull request #47258 from dtzWill/fix/bitcoin-long-compile
bitcoin: don't build things not used, enable parallel building
2018-09-25 02:47:11 -05:00
Aneesh Agrawal fae4aa9f36 vagrant: Clean up Gemfile 2018-09-25 00:18:39 -07:00
Samuel Dionne-Riel 12051db622 U-Boot: Add Orange Pi Zero Plus2 (H5) build 2018-09-25 10:04:14 +03:00
Sarah Brofeldt a27863cd20
Merge pull request #47286 from jb55/clightning-bump
clightning: 0.6.0 -> 0.6.1
2018-09-25 08:49:10 +02:00
Will Dietz 8d83441a4c bitcoin: disable tests based on doCheck, per reviewer feedback
Thanks!
2018-09-25 01:31:45 -05:00
Will Dietz f02c8e29d7
Merge pull request #47308 from dtzWill/update/musl-upstream-fixes
musl: pick upstream fixes and improvements
2018-09-25 00:38:23 -05:00
Will Dietz 93b30a8809
Merge pull request #47309 from dtzWill/fix/libgomp-gcc-musl
gcc*: fix libgomp (OpenMP) to work w/musl, don't build DSO using initial-exec
2018-09-25 00:37:37 -05:00
Will Dietz 8a0a34f766 openblas: try leaving openmp enabled w/musl 2018-09-25 00:08:17 -05:00
Will Dietz fecd326399 gcc{5,6,7,8}: share libgomp patch, propagate musl config flags 2018-09-25 00:08:17 -05:00
Will Dietz e845be1756 gcc: fix libgomp to not use initial-exec
Only apply w/musl since while it's wrong everywhere it apparently
hasn't broken things entirely w/glibc so keep things as they were.

Patch regenerated from original so that it applies
which isn't saying much since it's simple :).

Source:

https://patchwork.ozlabs.org/patch/154298/

IRC chat on #musl with Rich and others endorses this,
at least at the conceptual level of no shared library
should be using initial-exec TLS.

Fixes various uses of libgomp that previously crashed (before 1.1.20)
or encounter errors (post-1.1.20), such as pythonPackages.cython .
2018-09-25 00:04:33 -05:00
Will Dietz 3ec0d14140 gcc7: more options for musl 2018-09-25 00:04:32 -05:00
Will Dietz d3a0aa22da musl: reduce stacksize patch series to just the bump
The others rely on some of the recent restructuring+cleanup in musl,
which hopefully reaches us soon :).

For now just bump the default sizes.
2018-09-24 23:59:02 -05:00
Will Dietz f38218a756 musl: pick stacksize-related improvements, increase default size
Also supports setting default thread stack size via linker,
making it possible to fix programs without modifying source.
2018-09-24 23:59:02 -05:00
Will Dietz dcd5e4558f musl: pick getaddrinfo fix (containers) 2018-09-24 23:59:02 -05:00
Will Dietz 5c217591fd musl: pick upstream patches for name_to_handle_at support 2018-09-24 23:59:02 -05:00
Will Dietz ed5347278f musl: whitespace, NFC 2018-09-24 23:59:02 -05:00
Orivej Desh f5aed4dd5e protobufc: 1.3.0 -> 1.3.1 2018-09-25 03:50:40 +00:00
aszlig 19e83bc2ba
Merge autoPatchelfHook improvements (#47222)
This includes the initialy commit was done by @Mic92 plus a few fixes
from my side. So essentially this avoids patching statically linked
executables and also speeds up searching for ELF files altogether.

I've tested this by comparing the outputs of all the derivations which
make use of this hook using the following Nix expression:

  let
    getPackagesForRev = rev: with import (builtins.fetchGit {
      url = ./.;
      inherit rev;
    }) { config.allowUnfree = true; }; [
      cups-kyodialog3 elasticsearch franz gurobi javacard-devkit
      masterpdfeditor maxx oracle-instantclient powershell reaper
      teamviewer unixODBCDrivers.msodbcsql17 virtlyst wavebox zoom-us
    ];

    pkgs = import <nixpkgs> {};
    baseRev = "ef764eb0d8314b81a012dae04642b4766199956d";

  in pkgs.runCommand "diff-contents" {
    chset = pkgs.lib.zipListsWith (old: new: pkgs.runCommand "diff" {
      inherit old new;
      nativeBuildInputs = [ pkgs.nukeReferences ];
    } ''
      mkdir -p "''${NIX_STORE#/}"
      cp --no-preserve=all -r "$old" "''${NIX_STORE#/}"
      cp --no-preserve=all -r "$new" "''${NIX_STORE#/}"
      find "''${old#/}" "''${new#/}" \
        \( -type f -exec nuke-refs {} + \) -o \( -type l -delete \)
      mkdir "$out"
      echo "$old" > "$out/old-path"
      echo "$new" > "$out/new-path"
      diff -Nur "''${old#/}" "''${new#/}" > "$out/diff" || :
    '') (getPackagesForRev baseRev) (getPackagesForRev "");
  } ''
    err=0
    for c in $chset; do
      if [ -s "$c/diff" ]; then
        echo "$(< "$c/old-path") -> $(< "$c/new-path")" \
             "differs, report: $c/diff" >&2
        err=1
      fi
    done
    [ $err -eq 0 ] && touch "$out"
  ''

With these changes there is only one derivation which has altered
contents, which is "franz". However the reason why it has differing
contents is not directly because of the autoPatchelfHook changes, but
because the "env-vars" file from the builder is in
"$out/opt/franz/env-vars" (Cc: @gnidorah) and we now have different
contents for NIX_CFLAGS_COMPILE and other environment variables.

I also tested this against a random static binary and the hook no longer
tries to patch it.

Merges: #47222
2018-09-25 05:21:01 +02:00
aszlig 8df68a93e6
elasticsearch: Add zlib to buildInputs for unfree
The unfree variant of elasticsearch uses autoPatchelfHook and since we
removed the dependency on file for the hook itself in
58a97dfb49 we no longer have zlib
propagated.

So we need to explicitly state that dependency here.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @apeschar, @basvandijk
2018-09-25 05:09:37 +02:00
Ryan Mulligan 8d865c9515
Merge pull request #44956 from puffnfresh/package/blastem
blastem: init at 0.5.1
2018-09-24 20:04:55 -07:00
aszlig b4526040a2
autoPatchelfHook: Silence errors in isExecutable
The "maxx" package recursively runs isExecutable on a bunch of files and
since the change to use "readelf" instead of "file" a lot of errors like
this one are printed during build:

  readelf: Error: Not an ELF file - it has the wrong magic bytes at the
  start

While the isExecutable was never meant to be used outside of the
autoPatchelfHook, it's still a good idea to silence the errors because
whenever readelf fails, it clearly indicates that the file in question
is not a valid ELF file.

Signed-off-by: aszlig <aszlig@nix.build>
2018-09-25 04:48:12 +02:00
aszlig 9920215d00
autoPatchelfHook: Only check PT_INTERP on execs
If the ELF file is not an executable, we do not get a PT_INTERP section,
because after all, it's a *shared* library.

So instead of checking for PT_INTERP (to avoid statically linked
executables) for all ELF files, we add another check to see if it's an
executable and *only* skip it when it is and there's no PT_INTERP.

Signed-off-by: aszlig <aszlig@nix.build>
2018-09-25 04:42:34 +02:00
Matthew Bauer 2240445067 emacsMacport: 7.1 → 7.2
Fixes a critical issue with macOS

[NEWS](https://bitbucket.org/mituharu/emacs-mac/raw/master/NEWS-mac)

* emacs-26.1-mac-7.2 (2018-09-09)

** Fixed bugs

*** Buffer contents are not displayed on macOS 10.14.
This is mainly because now NSViews are backed by Core Animation Layer
(layer-backed) by default and non-deferred drawing into views no
longer works.  Instead of switching to deferred drawing (i.e., draw
only inside -[NSView drawRect:]), we draw into our own backing bitmap
in a non-deferred way as before, and update the view contents with the
resulting image via -[NSView updateLayer].  This "application-side
double buffering" is also available on OS X 10.8 - macOS 10.13 if you
set the frame parameter `inhibit-double-buffering' to nil when
creating a frame.  Just like on macOS 10.14, such a frame does not do
LCD smoothing.

*** Screenshot grabbed via Services is displayed in wrong size when we
have display mirroring between Retina and non-Retina displays.

*** Cursor movement just after frame resize sometimes leaves garbage.

*** Crash by the Fall_threads call from the GUI thread at the select
emulation when there are multiple Lisp threads.

*** Info title has ASCII underline unlike other window systems.

*** Vertical scroll bar is created as horizontal if frame font height
is short.

** Improvements

*** macOS 10.14 adds property :appearance to (mac-application-state).
The value may be "NSAppearanceNameAqua" or "NSAppearanceNameDarkAqua".

*** Add new color format "mac:COLOR-LIST-NAME:COLOR-NAME" and
"mac:COLOR-NAME" (shorthand for "mac:System:COLOR-NAME").  The actual
color may be different depending on the global appearance setting on
macOS 10.14.  For example, "mac:textColor" is black on the Light Mode
but is white on the Dark Mode.

*** Default frame colors respect appearance setting on macOS 10.14.
Now the default frame foreground/background color is
"mac:textColor"/"mac:textBackgroundColor", respectively.  Changes of
the system setting of the global appearance are dynamically reflected.

*** New function `mac-color-list-alist' to get the available
combinations of COLOR-LIST-NAMEs and COLOR-NAMEs.  Note that this
value is dependent on user environment and OS version.  Also, some
combinations may represent image patterns rather than colors.  For the
former cases, `(color-values "mac:COLOR-LIST-NAME:COLOR-NAME")'
returns nil.
2018-09-24 21:39:11 -05:00
Orivej Desh (NixOS) 9942ceef1f
Merge pull request #47307 from orivej/protobuf
protobuf3_6: init at 3.6.1
2018-09-25 02:20:51 +00:00
worldofpeace 94d079b6bc adwaita-qt: init at 1.0 2018-09-24 22:16:00 -04:00
worldofpeace 6793313708 qgnomeplatform: init at 0.4 2018-09-24 22:16:00 -04:00
WilliButz 78ad8d4a62 nixos/gitlab: rebuild authorized_keys during preStart
This updates the path to the 'gitlab-shell' to the
correct store path when gitlab is restarted.
2018-09-25 03:53:32 +02:00
Robin Gloster dc915565ba gitlab module: workhorse may start before gitlab 2018-09-25 03:53:32 +02:00
Robin Gloster ed85eb5433 gitlab: 11.2.3 -> 11.3.0 2018-09-25 03:53:32 +02:00
Robin Gloster cbc21b8b90 gitaly: 0.117.2 -> 0.120.0 2018-09-25 03:53:32 +02:00
Robin Gloster 545c07108f gitlab-shell: 8.1.1 -> 8.3.3 2018-09-25 03:53:32 +02:00
Robin Gloster 96c1765bac gitlab-workhorse: 6.0.0 -> 6.1.0 2018-09-25 03:53:32 +02:00
Kristoffer Thømt Ravneberg f17f59ca8e nixos/gitlab: avoid creating recursive symlinks, add gitlab-rake deps 2018-09-25 03:53:32 +02:00
Kristoffer Thømt Ravneberg 6946d97ce4 gitlab-ee: init at 11.2.3 2018-09-25 03:53:32 +02:00
Kristoffer Thømt Ravneberg 51c1830147 gitlab: 10.8.0 -> 11.2.3 2018-09-25 03:53:32 +02:00
Kristoffer Thømt Ravneberg bfc8d80c6e gitlab-shell: 7.1.2 -> 8.1.1 2018-09-25 03:53:32 +02:00
Kristoffer Thømt Ravneberg 949172f289 gitaly: 0.100.0 -> 0.117.2 2018-09-25 03:53:32 +02:00
Kristoffer Thømt Ravneberg 45aa373fa9 gitlab-workhorse: 4.2.0 -> 6.0.0 2018-09-25 03:53:32 +02:00
Orivej Desh 1c3ecab0f7 protobuf3_6: init at 3.6.1 2018-09-25 01:44:46 +00:00
Orivej Desh 12a1c2e6c5 protobuf: rename github owner to protocolbuffers
https://github.com/google/protobuf redirects to
https://github.com/protocolbuffers/protobuf
2018-09-25 01:43:15 +00:00
John Ericson 72dd8565d8
Merge pull request #47303 from obsidiansystems/haskell-no-rec
ghc, ghcjs: Get rid of extraneous alex, happy, and hscolour args
2018-09-24 20:28:14 -04:00
John Ericson 1fcdf4325b Merge remote-tracking branch 'upstream/master' into haskell-no-rec 2018-09-24 20:12:16 -04:00
John Ericson 4adf621798 Merge remote-tracking branch 'upstream/master' into haskell-no-rec 2018-09-24 20:09:25 -04:00
John Ericson e6a476c862 ghc, ghcjs: Get rid of extraneous alex, happy, and hscolour args
The compilers themselves can pull them from `bootPkgs`, where they
should always come from anyways. This enforces that, simplifies that
code, and allows use to avoid more `rec { ... }` too.
2018-09-24 20:00:39 -04:00
Brian McKenna 77088b5d12 blastem: init at 0.5.1 2018-09-25 09:33:11 +10:00
John Ericson 3dbe6bee3c
Merge pull request #47300 from obsidiansystems/haskell-no-rec
haskellPackages: Avoid outer `rec { .. }`
2018-09-24 18:59:01 -04:00
John Ericson 5779fdb3d0 haskellPackages: Avoid outer rec { .. }
This is much nicer for overlays. For example, if someone binds a new
compiler / package set, its integer-simple variation will automatically
appear.
2018-09-24 18:42:04 -04:00
John Ericson 22ce614112
Merge pull request #47238 from obsidiansystems/overrideScope-order
lib: Deprecate `overrideScope` in lieu of `overrideScope'` taking arguments in the conventional order
2018-09-24 18:04:18 -04:00