Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: aade6ded7969
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e94ecca11dc1
Choose a head ref

Commits on Apr 13, 2019

  1. wafHook: let derivations use an existing waf in a non-standard location

    this is necessary for talloc
    
    (cherry picked from commit f075de5)
    symphorien authored and veprbl committed Apr 13, 2019
    Copy the full SHA
    2f8b886 View commit details
  2. wafHook: ignore --disable-static and such options

    These options are forcefully added by pkgsStatic but are not understood
    by waf.
    
    (cherry picked from commit f23a215)
    symphorien authored and veprbl committed Apr 13, 2019
    Copy the full SHA
    17fb45d View commit details
  3. wafHook: ignore configurePlatforms

    waf does support --build and --host, but the only effect of these
    options is an error message telling to use --cross-compile instead.
    So we ignore these flags.
    
    (cherry picked from commit 1001d00)
    symphorien authored and veprbl committed Apr 13, 2019
    Copy the full SHA
    c5bfc48 View commit details
  4. wafHook: cross compilation support

    for this to work, wafHook must be in nativeBuildInputs.
    
    (cherry picked from commit 3d60a00)
    symphorien authored and veprbl committed Apr 13, 2019
    Copy the full SHA
    ca5148a View commit details
  5. talloc, tdb: fix cross-compilation after wafHook improvements

    (cherry picked from commit cbd9409)
    symphorien authored and veprbl committed Apr 13, 2019
    Copy the full SHA
    25ec19f View commit details
  6. proot: fix cross compilation

    (cherry picked from commit 52566c3)
    symphorien authored and veprbl committed Apr 13, 2019
    Copy the full SHA
    05fa593 View commit details
  7. waf: use wafConfigureFlags for waf flags

    This avoids the potential conflict between autoconf flags and the waf
    flags. There is some overlap between the two but waf errors when it
    doesn’t recognize the flag.
    
    (cherry picked from commit a79a8f2)
    matthewbauer authored and veprbl committed Apr 13, 2019
    Copy the full SHA
    c90e7a3 View commit details

Commits on Apr 15, 2019

  1. Merge pull request #59407 from veprbl/pr/static-proot_backport_staging

    [19.03] Static proot, wafHook cross compilation
    veprbl authored Apr 15, 2019
    Copy the full SHA
    2bb5cc2 View commit details
  2. emacs: Link subdirs.el into emacs-packages-deps

    Emacs loads all the elisp files in the top-level of the site-lisp
    directory. However some packages (e.g. mu4e) put their elisp files in a
    subdirectory of site-lisp. Emacs will not load these packages unless
    subdirs.el is present.
    
    This commit links the subdirs.el file from the emacs package into the
    emacs-package-deps package so that packages that put their elisp files
    in a subdirectory of site-lisp are loaded.
    moyamo committed Apr 15, 2019
    Copy the full SHA
    b33e1ac View commit details

Commits on Apr 18, 2019

  1. python3{5,6}: Reintroduce bytecode determinism

    Originally introduced in 8970a9c and 1531b5e, these patches were lost in
    efbe87f when the CPython version files were merged, likely due to
    CPython 3.7 not needing them anymore. These patches should remain
    in-tree until CPython 3.5 and 3.6 support is dropped completely.
    
    Found with the diffoscope ( https://diffoscope.org/ ).
    
    (cherry picked from commit 28ac309)
    bb010g authored and FRidh committed Apr 18, 2019
    Copy the full SHA
    cb00048 View commit details

Commits on Apr 21, 2019

  1. ghcjs-ng: unbreak

    (cherry picked from commit e4975aa)
    vaibhavsagar authored and basvandijk committed Apr 21, 2019
    Copy the full SHA
    734211d View commit details

Commits on Apr 25, 2019

  1. Merge pull request #59620 from moyamo/fix-subdirs.el-19.03

    [19.03] emacs: Link subdirs.el into emacs-packages-deps
    c0bw3b authored Apr 25, 2019
    Copy the full SHA
    e3591d8 View commit details

Commits on Apr 26, 2019

  1. python: Jinja2: 2.10 -> 2.10.1

    (cherry picked from commit 5bcf827)
    FRidh authored and Robert Schütz committed Apr 26, 2019
    Copy the full SHA
    336d98c View commit details

Commits on Apr 29, 2019

  1. openblas: turn off AVX512 optimizations

    The AVX512 optimization has a bug in openblas-0.3.5
    and can also lead to slower code on Xeon Silver CPUs.
    
    See OpenMathLib/OpenBLAS#1955
    and OpenMathLib/OpenBLAS#2029
    
    (cherry picked from commit 7035aa7de4fa8668b6d7feab7b1ed58015689d09)
    markuskowa committed Apr 29, 2019
    Copy the full SHA
    28a5c36 View commit details

Commits on May 4, 2019

  1. Copy the full SHA
    78b0673 View commit details

Commits on May 8, 2019

  1. Copy the full SHA
    940d8c9 View commit details
  2. firefox-beta-bin: 67.0b7 -> 670b18

    (cherry picked from commit c771c1dcc2bafc6854f68036581d30227c364d9c)
    andir committed May 8, 2019
    Copy the full SHA
    516bfe4 View commit details
  3. firefox-bin: 66.0.4 -> 66.0.5

    Signed-off-by: Andreas Rammhold <andreas@rammhold.de>
    andir committed May 8, 2019
    Copy the full SHA
    d0fdae6 View commit details
  4. firefox: 66.0.4 -> 66.0.5

    (cherry picked from commit 67201d0de6e4bd695330ba0e0602be1eca83d5ec)
    andir committed May 8, 2019
    Copy the full SHA
    ba383c7 View commit details
  5. linux: add 5.1 release

    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    (cherry picked from commit 181e971)
    thoughtpolice authored and lheckemann committed May 8, 2019
    Copy the full SHA
    482765b View commit details
  6. Merge pull request #61132 from andir/19.03/firefox

    [19.03] firefox: 66.0.4 -> 66.0.5, firefox-bin: 66.0.4 -> 66.0.5, firefox-beta-bin: 67.0b7 -> 670b18
    edolstra authored May 8, 2019
    Copy the full SHA
    16ecfeb View commit details
  7. Merge pull request #59567 from LumiGuide/release-19.03-unbreak-ghcjs

    ghcjs-ng: unbreak - Backport from master
    basvandijk authored May 8, 2019
    Copy the full SHA
    7095449 View commit details
  8. linuxPackages.perf: add libopcodes as a buildInput

    Newer versions of perf in Linux 5.1+ support disassembling and
    annotating eBPF programs inside the kernel. In order to do this, it uses
    libbfd's support for bpf disassembly. There are two parts: libopcodes
    and libbfd.
    
    The 'perf' build system seems to expect libopcodes/libbfd to go "hand in
    hand" -- always together, if one or the other is installed. If the build
    system detects libbfd is available, then an import of <dis-asm.h> is
    performed, but this fails since it wasn't in the buildInput. Fixing this
    should be an easy, backwards-compatible change.
    
    Fixes #60891, allowing linuxPackages_testing.perf to build again
    (currently kernel version 5.1.0-rc7).
    
    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    (cherry picked from commit c8cb015)
    thoughtpolice authored and lheckemann committed May 8, 2019
    Copy the full SHA
    52ac2d9 View commit details
  9. Copy the full SHA
    d6f60b7 View commit details
  10. Copy the full SHA
    f96ac31 View commit details
  11. Copy the full SHA
    0bccda7 View commit details
  12. linux: 5.0.13 -> 5.0.14

    NeQuissimus committed May 8, 2019
    Copy the full SHA
    e94ecca View commit details
Showing with 915 additions and 857 deletions.
  1. +3 −3 doc/stdenv.xml
  2. +1 −1 pkgs/applications/audio/ardour/default.nix
  3. +1 −1 pkgs/applications/audio/guitarix/default.nix
  4. +1 −1 pkgs/applications/misc/xiphos/default.nix
  5. +397 −397 pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
  6. +397 −397 pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
  7. +2 −2 pkgs/applications/networking/browsers/firefox/packages.nix
  8. +8 −4 pkgs/build-support/emacs/wrapper.nix
  9. +1 −0 pkgs/development/compilers/ghcjs-ng/common-overrides.nix
  10. +0 −1 pkgs/development/compilers/ghcjs-ng/default.nix
  11. +17 −0 pkgs/development/interpreters/python/cpython/3.5/force_bytecode_determinism.patch
  12. +5 −2 pkgs/development/interpreters/python/cpython/default.nix
  13. +1 −1 pkgs/development/libraries/audio/lvtk/default.nix
  14. +1 −1 pkgs/development/libraries/ndn-cxx/default.nix
  15. +1 −0 pkgs/development/libraries/science/math/openblas/default.nix
  16. +1 −1 pkgs/development/libraries/science/networking/ns3/default.nix
  17. +9 −10 pkgs/development/libraries/talloc/default.nix
  18. +5 −11 pkgs/development/libraries/tdb/default.nix
  19. +2 −2 pkgs/development/python-modules/jinja2/default.nix
  20. +11 −8 pkgs/development/tools/build-managers/waf/setup-hook.sh
  21. +1 −1 pkgs/misc/emulators/wxmupen64plus/default.nix
  22. +1 −1 pkgs/misc/jackaudio/default.nix
  23. +2 −2 pkgs/os-specific/linux/kernel/linux-4.14.nix
  24. +2 −2 pkgs/os-specific/linux/kernel/linux-4.19.nix
  25. +2 −2 pkgs/os-specific/linux/kernel/linux-4.9.nix
  26. +2 −2 pkgs/os-specific/linux/kernel/linux-5.0.nix
  27. +18 −0 pkgs/os-specific/linux/kernel/linux-5.1.nix
  28. +2 −1 pkgs/os-specific/linux/kernel/perf.nix
  29. +1 −1 pkgs/tools/graphics/glmark2/default.nix
  30. +5 −0 pkgs/tools/system/proot/default.nix
  31. +15 −2 pkgs/top-level/all-packages.nix
6 changes: 3 additions & 3 deletions doc/stdenv.xml
Original file line number Diff line number Diff line change
@@ -2740,9 +2740,9 @@ addEnvHooks "$hostOffset" myBashFunction
<listitem>
<para>
Overrides the configure, build, and install phases. This will run the
"waf" script used by many projects. If waf doesn’t exist, it will copy
the version of waf available in Nixpkgs wafFlags can be used to pass
flags to the waf script.
"waf" script used by many projects. If wafPath (default ./waf)
doesn’t exist, it will copy the version of waf available in Nixpkgs.
wafFlags can be used to pass flags to the waf script.
</para>
</listitem>
</varlistentry>
2 changes: 1 addition & 1 deletion pkgs/applications/audio/ardour/default.nix
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
patchShebangs ./tools/
'';

configureFlags = [
wafConfigureFlags = [
"--optimize"
"--docs"
"--with-backends=jack,alsa,dummy"
2 changes: 1 addition & 1 deletion pkgs/applications/audio/guitarix/default.nix
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
zita-resampler curl
];

configureFlags = [
wafConfigureFlags = [
"--shared-lib"
"--no-desktop-update"
"--enable-nls"
2 changes: 1 addition & 1 deletion pkgs/applications/misc/xiphos/default.nix
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
export SWORD_HOME=${sword};
'';

configureFlags= [ "--enable-webkit2" ];
wafConfigureFlags = [ "--enable-webkit2" ];

meta = with stdenv.lib; {
description = "A GTK Bible study tool";
Loading