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: 41a9722917f1
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: e8853782a0bc
Choose a head ref
  • 19 commits
  • 19 files changed
  • 11 contributors

Commits on Apr 4, 2018

  1. callHackage: Keep deriver, like callCabal2nix

    @ElvishJerricco
    ElvishJerricco committed Apr 4, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    GPG key ID: 472BFCCA96BD0EDA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    312a8b4 View commit details

Commits on Apr 5, 2018

  1. gnome3.webkitgtk: fix build 

    (cherry picked from commit f1b19d3)

see NixOS/nixpkgs#37050
    @jtojnar @bendlas
    jtojnar authored and bendlas committed Apr 5, 2018
    Copy the full SHA
    cb285dd View commit details

  2. webkitgtk: 2.18 -> 2.20 

    (cherry picked from commit 562ae56)

see NixOS/nixpkgs#37050
    @bendlas
    bendlas committed Apr 5, 2018
    Copy the full SHA
    d9a2552 View commit details

  3. webkitgtk: patch shebangs in postPatch 

    this eliminates a build error due to /bin/bash in build scripts

(cherry picked from commit 3a3ea1a)

see NixOS/nixpkgs#37050
    @bendlas
    bendlas committed Apr 5, 2018
    Copy the full SHA
    ed6c49f View commit details

  4. webkitgtk220x: cleanup 

    (cherry picked from commit 9fa2844)

see NixOS/nixpkgs#37050
    @jtojnar @bendlas
    jtojnar authored and bendlas committed Apr 5, 2018
    Copy the full SHA
    88c5eee View commit details

  5. webkitgtk: fix non-deterministic build failure 

    The build sometimes fails, mostly when using a single core. This is a simple
stopgap, see upstream bug: https://bugs.webkit.org/show_bug.cgi?id=183788

(cherry picked from commit 5058529)

see NixOS/nixpkgs#37050
    @hedning @bendlas
    hedning authored and bendlas committed Apr 5, 2018
    Copy the full SHA
    4aeff6d View commit details

  6. webkitgtk: use enchant instead of enchant2 

    see NixOS/nixpkgs#37050
    @bendlas
    bendlas committed Apr 5, 2018
    Copy the full SHA
    cae87f6 View commit details

  7. woff2: propagate brotli build input 

    brotli is a runtime dependency, as per pc files in woff2.dev

cc @hrdinka

(cherry picked from commit 86fbdfd)

NixOS/nixpkgs#37050
    @bendlas
    bendlas committed Apr 5, 2018
    Copy the full SHA
    6aea1df View commit details

  8. godot: add application metadata and man page to share. 

    (cherry picked from commit 39db8ac)
    @coreyoconnor @Mic92
    coreyoconnor authored and Mic92 committed Apr 5, 2018
    Copy the full SHA
    0504cbe View commit details

Commits on Apr 6, 2018

  1. nixos/lxqt: enable upower if config.powerManagement is enabled (#38318) 

    (cherry picked from commit d488a9d)
    @redfish64 @Mic92
    redfish64 authored and Mic92 committed Apr 6, 2018
    Copy the full SHA
    207b429 View commit details

  2. Update create-gce.sh script. Set default option for GCE images to dis… 

    …able host key replacement by service.
    @rbvermaa
    rbvermaa committed Apr 6, 2018
    Copy the full SHA
    748d96f View commit details

  3. atom : 1.25.0 -> 1.25.1 

    (cherry picked from commit e7a352f)
    @Synthetica9 @Mic92
    Synthetica9 authored and Mic92 committed Apr 6, 2018
    Copy the full SHA
    0d633d6 View commit details

  4. zfsUnstable: mark correct zfs version as incompatible 

    (cherry picked from commit e7f2b76)
    @Mic92
    Mic92 committed Apr 6, 2018
    Copy the full SHA
    97de18f View commit details

  5. julia: remove wrapper from julia binaries, in stead 

    symlink shared libraries from LD_LIBRARY_PATH into lib/julia,
as using a wrapper with LD_LIBRARY_PATH causes segmentation
faults when program returns an error:

 $ julia -e 'throw(Error())'

only applied for 0.6, which is the current julia version. Will
see if we can remove the older versions in master.
    @rbvermaa
    rbvermaa committed Apr 6, 2018
    Copy the full SHA
    41f3a4e View commit details

  6. Merge pull request #38442 from ElvishJerricco/backport-callhackage-de… 

    …river-18.03

Backport: callHackage: Keep deriver, like callCabal2nix
    @peti
    peti authored Apr 6, 2018
    Copy the full SHA
    c194065 View commit details

  7. zfsUnstable: fix evaluation of error message 

    (cherry picked from commit 0af5b25)
    @Mic92
    Mic92 committed Apr 6, 2018
    Copy the full SHA
    b47c503 View commit details

  8. wxwidgets: depend on generic webkitgtk instead of 218x 

    Currently ahead of the upgrade to webkitgtk220x, this will make future
webkitgtk maintenance easier.

WebkitGTK, from 2.6 onwards has maintained API stability and will
continue to do so, as opposed to the jump from 2.4 to 2.6

(cherry picked from commit 0b8d7fb)
    @bendlas @disassembler
    bendlas authored and disassembler committed Apr 6, 2018
    Copy the full SHA
    4bbaec1 View commit details

  9. vimb-unwrapped: depend on generic webkitgtk instead of 218x 

    Currently ahead of the upgrade to webkitgtk220x, this will make future
webkitgtk maintenance easier.

WebkitGTK, from 2.6 onwards has maintained API stability and will
continue to do so, as opposed to the jump from 2.4 to 2.6

cc @rickynils

(cherry picked from commit 80582c6)
    @bendlas @disassembler
    bendlas authored and disassembler committed Apr 6, 2018
    Copy the full SHA
    c1c7084 View commit details

  10. neomutt: Fix the path to the auxiliary tools 

    This path changed from $out/lib/neomutt to $out/libexec/neomutt.

(cherry picked from commit 80faa73)
Reason: This fix is required to use OpenPGP encryption (via GnuPG) in
NeoMutt with the default gpg.rc [0]. (When using crypt_use_gpgme this
fix isn't required.)

[0]: https://github.com/neomutt/neomutt/blob/32dfd7baf3e7647c9f72a2ca8c84fb614f032ad0/contrib/gpg.rc
    @primeos
    primeos committed Apr 6, 2018
    Copy the full SHA
    e885378 View commit details
Loading