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: 411cc559c052
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: d6c6c7fcec6d
Choose a head ref

Commits on Jul 2, 2018

  1. Copy the full SHA
    c8d83a1 View commit details

Commits on Jul 4, 2018

  1. plasma5: 5.12.5 -> 5.12.6

    bkchr committed Jul 4, 2018
    Copy the full SHA
    b4f107d View commit details
  2. Copy the full SHA
    745e90e View commit details

Commits on Jul 9, 2018

  1. stdenv-setup: Remove superfluous check for /bin/sh

    The line was essentially checking whether /bin/sh exists and is
    executable and if that's the case, the isScript function returns
    successfully.
    
    When asking the author of this line on IRC it seems that even they can't
    remember or imagine what this was supposed to be.
    
    In summary: Whenever /bin/sh doesn't exist during a build, *any* file
    given to isScript is reported as being a script even if it isn't.
    
    This is kinda counter-intuitive and not something what somebody would
    expect from a function called "isScript".
    
    Signed-off-by: aszlig <aszlig@nix.build>
    Cc: @edolstra
    (cherry picked from commit 739c835)
    aszlig committed Jul 9, 2018
    Copy the full SHA
    c158f43 View commit details

Commits on Jul 10, 2018

  1. Copy the full SHA
    b7f4e86 View commit details
  2. Copy the full SHA
    41088a6 View commit details

Commits on Jul 12, 2018

  1. Copy the full SHA
    8612112 View commit details

Commits on Jul 14, 2018

  1. go_1_10: remove cache artifacts from package

    fixes #42465
    Mic92 committed Jul 14, 2018
    Copy the full SHA
    2192f3a View commit details
  2. Merge pull request #43033 from bkchr/plasma_5_12_6

    Plasma5 & KdeApplications bugfix releases
    adisbladis authored Jul 14, 2018
    Copy the full SHA
    263304f View commit details

Commits on Jul 15, 2018

  1. Copy the full SHA
    aae92fe View commit details
  2. ffmpeg{,-full}: 3.4.2 -> 3.4.3 (security)

    https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/89355585366:/Changelog
    /cc #42883: it certainly seems to fix some security issues,
    but I'm not sure about mapping to particular CVE numbers;
    perhaps it will appear on http://ffmpeg.org/security.html
    
    (cherry picked from commit 10cbebe)
    vcunat committed Jul 15, 2018
    Copy the full SHA
    cf3effc View commit details
  3. ffmpeg: fix includedir in pkg-config files

    (cherry picked from commit 342f72e)
    thefloweringash authored and vcunat committed Jul 15, 2018
    Copy the full SHA
    ffb5122 View commit details
  4. qutebrowser: fix patch excludes

    Robert Schütz committed Jul 15, 2018
    Copy the full SHA
    f981bad View commit details
  5. dbeaver: 5.1.2 -> 5.1.3

    (cherry picked from commit 7d10768)
    samueldr committed Jul 15, 2018
    Copy the full SHA
    cd51d16 View commit details

Commits on Jul 16, 2018

  1. Merge pull request #43592 from samueldr/auto/dbeaver/nixos-18.03/5.1.3

    dbeaver: 5.1.2 -> 5.1.3 (18.03)
    fpletz authored Jul 16, 2018
    Copy the full SHA
    eb9a6c6 View commit details
  2. Merge pull request #43549 from LumiGuide/network-2.6.3.6-release-18.03

    haskell/network: 2.6.3.4 -> 2.6.3.6 (release-18.03)
    peti authored Jul 16, 2018
    Copy the full SHA
    a4110f3 View commit details
  3. gnome3.geary: 0.12.2 → 0.12.3 (#43569)

    (cherry picked from commit 1997dea)
    alexeymuranov authored and xeji committed Jul 16, 2018
    Copy the full SHA
    b3dd272 View commit details
  4. vlc: 2.2.8 -> 3.0.3

    Backported from master to solve a number of known security vulnerabilities.
    
    Reference:
    NixOS/nixpkgs#43307
    stefano-m committed Jul 16, 2018
    Copy the full SHA
    d96ade3 View commit details
  5. phonon-backend-vlc: 0.9.0 -> 0.10.1

    Backported from master. Needed after vlc update
    stefano-m committed Jul 16, 2018
    Copy the full SHA
    b0ea994 View commit details

Commits on Jul 17, 2018

  1. spidermonkey: fix i686 error on 38

    spidermonkey doesn’t compile correctly on i686 linux & gcc7. It gives
    the error:
    
      with gcc-7: undefined reference to `__divmoddi4'
    matthewbauer committed Jul 17, 2018
    Copy the full SHA
    fd4b5ac View commit details
  2. home-assistant: mark as insecure

    The packaged version is susceptible to man-in-the-middle attacks.
    See https://www.home-assistant.io/blog/2018/07/16/release-73-2/.
    Robert Schütz committed Jul 17, 2018
    Copy the full SHA
    a49962c View commit details
  3. linux: 4.4.130 -> 4.4.141

    (cherry picked from commit 5b259a67f97af82556653d8a3452aa60346f2e19)
    NeQuissimus committed Jul 17, 2018
    Copy the full SHA
    befa20b View commit details
  4. linux: 4.9.112 -> 4.9.113

    (cherry picked from commit b73dc5b80aafae473ca3be2d24629c4505e4e370)
    NeQuissimus committed Jul 17, 2018
    Copy the full SHA
    1bfd10a View commit details
  5. linux: 4.14.55 -> 4.14.56

    (cherry picked from commit c7e1e0a92f1d5adcd886597951e481ecf23ee530)
    NeQuissimus committed Jul 17, 2018
    Copy the full SHA
    3670035 View commit details
  6. linux: 4.17.6 -> 4.17.7

    (cherry picked from commit 5f9770ff0be8fa74533ba26de516281b94fc8925)
    NeQuissimus committed Jul 17, 2018
    Copy the full SHA
    be11b88 View commit details
  7. keybase-gui: fix kbfs mount path check (#40080)

    (cherry picked from commit b3c3df4)
    brainrake authored and benley committed Jul 17, 2018
    Copy the full SHA
    a664478 View commit details
  8. signal: s/xlibs/xorg/g (#36889)

    (cherry picked from commit 7ec0471)
    This isn't a real cherry pick, as I've only applied the changes
    affecting Signal (these changes are required to cherry-pick further
    commits) and customized the subject to avoid confusion.
    primeos committed Jul 17, 2018
    Copy the full SHA
    58df454 View commit details
  9. signal-desktop: gnome2 cleanup (#41156)

    (cherry picked from commit e1b501a)
    worldofpeace authored and primeos committed Jul 17, 2018
    Copy the full SHA
    5d27cfc View commit details
  10. signal-desktop: use top-level gtk

    (cherry picked from commit 1ac4be3)
    jtojnar authored and primeos committed Jul 17, 2018
    Copy the full SHA
    ad29edf View commit details
  11. signal-desktop: 1.11.0 -> 1.12.0

    (cherry picked from commit 507d24a)
    primeos committed Jul 17, 2018
    Copy the full SHA
    0e4f91a View commit details
  12. signal-desktop: Fix a possible crash when saving an attachment

    If executed in a pure environment (nix-shell --pure) or depending on the
    `gtk3` version of the system Signal-Desktop was e.g. crashing when
    clicking on a PDF attachment (instead of showing the dialog to save a
    file).
    Using wrapGAppsHook and setting XDG_DATA_DIRS to the correct version
    fixes this bug.
    
    The error message was the following:
    ```
    (signal-desktop:30756): Gtk-WARNING **: 14:04:49.073: Could not find the icon 'user-home-symbolic-ltr'. The 'hicolor' theme
    was not found either, perhaps you need to install it.
    You can get a copy from:
            http://icon-theme.freedesktop.org/releases
    
    (signal-desktop:30756): GLib-GIO-ERROR **: 14:04:49.134: No GSettings schemas are installed on the system
    Trace/breakpoint trap
    ```
    
    (cherry picked from commit 5d79535)
    primeos committed Jul 17, 2018
    Copy the full SHA
    6bb53aa View commit details
  13. signal-desktop: Refactor the package description

    Removed some redundancy (src check via meta.platforms) and made some
    changes according to our style-guide.
    I've changed meta.description and added meta.longDescription.
    
    (cherry picked from commit ab593d4)
    primeos committed Jul 17, 2018
    Copy the full SHA
    1916d89 View commit details
  14. signal-desktop: 1.12.0 -> 1.12.1

    (cherry picked from commit 54ea1cd)
    primeos committed Jul 17, 2018
    Copy the full SHA
    702df6c View commit details
  15. signal-desktop: 1.12.1 -> 1.13.0

    (cherry picked from commit db0da28)
    primeos committed Jul 17, 2018
    Copy the full SHA
    a25bb84 View commit details
  16. signal-desktop: 1.13.0 -> 1.14.0

    (cherry picked from commit c4d94d6)
    primeos committed Jul 17, 2018
    Copy the full SHA
    e5872b3 View commit details
  17. signal-desktop: 1.14.0 -> 1.14.1

    (cherry picked from commit c4fca64)
    primeos committed Jul 17, 2018
    Copy the full SHA
    4709aaa View commit details
  18. Merge pull request #43677 from benley/benley/backport-kbfs-mount-check

    keybase-gui: fix kbfs mount path check
    grahamc authored Jul 17, 2018
    Copy the full SHA
    796b2b5 View commit details
  19. Merge pull request #43678 from primeos/signal-desktop-backport

    Backport signal-desktop to stable (18.03)
    
    Reason: According to an IRC discussion the Signal team might regularly
    break older clients.
    primeos authored Jul 17, 2018
    Copy the full SHA
    f9f9657 View commit details
  20. pythonPackages.simpy: init at 3.0.11.

    (cherry picked from commit 711c56d)
    shlevy committed Jul 17, 2018
    Copy the full SHA
    1a7efa0 View commit details
  21. virtualbox: 5.2.12 -> 5.2.14

    backport of #43659
    closes #41360
    
    (cherry picked from commit fa4c1ee)
    flokli authored and xeji committed Jul 17, 2018
    Copy the full SHA
    bbad2e5 View commit details

Commits on Jul 18, 2018

  1. Merge pull request #43660 from dotlambda/home-assistant-insecure

    [18.03] home-assistant: mark as insecure
    peterhoeg authored Jul 18, 2018
    Copy the full SHA
    2da449e View commit details
  2. linux: 4.17.7 -> 4.17.8

    (cherry picked from commit 8432dec)
    NeQuissimus committed Jul 18, 2018
    Copy the full SHA
    441a92a View commit details

Commits on Jul 19, 2018

  1. docker: 18.03 -> 18.06

    (cherry picked from commit e953d31)
    NeQuissimus committed Jul 19, 2018
    Copy the full SHA
    70b2b12 View commit details
  2. Merge pull request #43642 from stefano-m/release-18.03

    release-18.03: Update VLC to version 3.0.3
    andir authored Jul 19, 2018
    Copy the full SHA
    6dc8550 View commit details
  3. oraclejdk: 8u171 -> 8u181

    kamilchm authored and pSub committed Jul 19, 2018
    Copy the full SHA
    8ef4368 View commit details

Commits on Jul 20, 2018

  1. linux: 4.4.141 -> 4.4.142

    (cherry picked from commit 037e06f)
    NeQuissimus committed Jul 20, 2018
    Copy the full SHA
    f156984 View commit details
  2. nixos tests: temporarily disable nfs tests (/cc #43473)

    The regression in ext4 kernel code appears to cause no real issue
    to anyone, so I hate it would block other fixes from 18.03 for longer
    than a full week.
    (The ext4 changes themselves fix some CVE, though apparently minor.)
    vcunat committed Jul 20, 2018
    Copy the full SHA
    b9dccd8 View commit details
  3. gradle: 4.8 -> 4.8.1

    (cherry picked from commit fd269b9)
    NeQuissimus committed Jul 20, 2018
    Copy the full SHA
    f0bc8d8 View commit details
  4. gradle: 4.8.1 -> 4.9

    (cherry picked from commit a4d5583)
    NeQuissimus committed Jul 20, 2018
    Copy the full SHA
    e8a7f5d View commit details
  5. fixup: nixos tests: temporarily disable nfs tests

    We really have these things spread over too many files.
    vcunat committed Jul 20, 2018
    Copy the full SHA
    d6c6c7f View commit details
Showing with 1,284 additions and 1,240 deletions.
  1. +2 −2 nixos/release-combined.nix
  2. +1 −1 nixos/release-small.nix
  3. +3 −2 nixos/release.nix
  4. +1 −1 pkgs/applications/kde/fetch.sh
  5. +854 −854 pkgs/applications/kde/srcs.nix
  6. +2 −2 pkgs/applications/misc/dbeaver/default.nix
  7. +7 −2 pkgs/applications/networking/browsers/qutebrowser/default.nix
  8. +2 −2 pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix
  9. +54 −50 pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
  10. +58 −53 pkgs/applications/video/vlc/default.nix
  11. +1 −1 pkgs/applications/video/vlc/plugin.nix
  12. +10 −22 pkgs/applications/virtualization/docker/default.nix
  13. +4 −4 pkgs/applications/virtualization/virtualbox/default.nix
  14. +1 −1 pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
  15. +2 −2 pkgs/desktops/gnome-3/misc/geary/default.nix
  16. +1 −1 pkgs/desktops/plasma-5/fetch.sh
  17. +178 −178 pkgs/desktops/plasma-5/srcs.nix
  18. +2 −0 pkgs/development/compilers/go/1.10.nix
  19. +5 −5 pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
  20. +4 −9 pkgs/development/haskell-modules/hackage-packages.nix
  21. +2 −2 pkgs/development/libraries/ffmpeg-full/default.nix
  22. +2 −2 pkgs/development/libraries/ffmpeg/3.4.nix
  23. +6 −0 pkgs/development/libraries/ffmpeg/generic.nix
  24. +22 −0 pkgs/development/libraries/nghttp2/CVE-2018-1000168.patch
  25. +4 −0 pkgs/development/libraries/nghttp2/default.nix
  26. +10 −9 pkgs/development/libraries/phonon/backends/vlc.nix
  27. +18 −0 pkgs/development/python-modules/simpy/default.nix
  28. +2 −2 pkgs/development/tools/build-managers/gradle/default.nix
  29. +2 −2 pkgs/os-specific/linux/kernel/linux-4.14.nix
  30. +2 −2 pkgs/os-specific/linux/kernel/linux-4.17.nix
  31. +2 −2 pkgs/os-specific/linux/kernel/linux-4.4.nix
  32. +2 −2 pkgs/os-specific/linux/kernel/linux-4.9.nix
  33. +2 −0 pkgs/servers/home-assistant/default.nix
  34. +0 −1 pkgs/stdenv/generic/setup.sh
  35. +3 −4 pkgs/tools/security/keybase-gui/default.nix
  36. +11 −20 pkgs/top-level/all-packages.nix
  37. +2 −0 pkgs/top-level/python-packages.nix
4 changes: 2 additions & 2 deletions nixos/release-combined.nix
Original file line number Diff line number Diff line change
@@ -113,8 +113,8 @@ in rec {
(all nixos.tests.networking.scripted.macvlan)
(all nixos.tests.networking.scripted.sit)
(all nixos.tests.networking.scripted.vlan)
(all nixos.tests.nfs3)
(all nixos.tests.nfs4)
#(all nixos.tests.nfs3)
#(all nixos.tests.nfs4)
(all nixos.tests.openssh)
(all nixos.tests.php-pcre)
(all nixos.tests.predictable-interface-names.vm-test-run-predictableInterfaceNames)
2 changes: 1 addition & 1 deletion nixos/release-small.nix
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ in rec {
login
misc
nat
nfs3
#nfs3 FIXME: temporarily disabled, see #43473
openssh
php-pcre
predictable-interface-names
5 changes: 3 additions & 2 deletions nixos/release.nix
Original file line number Diff line number Diff line change
@@ -334,8 +334,9 @@ in rec {
tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; };
# TODO: put in networking.nix after the test becomes more complete
tests.networkingProxy = callTest tests/networking-proxy.nix {};
tests.nfs3 = callTest tests/nfs.nix { version = 3; };
tests.nfs4 = callTest tests/nfs.nix { version = 4; };
# FIXME: temporarily disabled, see #43473
#tests.nfs3 = callTest tests/nfs.nix { version = 3; };
#tests.nfs4 = callTest tests/nfs.nix { version = 4; };
tests.nginx = callTest tests/nginx.nix { };
tests.nghttpx = callTest tests/nghttpx.nix { };
tests.nix-ssh-serve = callTest tests/nix-ssh-serve.nix { };
2 changes: 1 addition & 1 deletion pkgs/applications/kde/fetch.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/applications/17.12.2/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/applications/17.12.3/ -A '*.tar.xz' )
Loading