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: f456d7f57533
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: 9f768ff43cec
Choose a head ref
35 contributors

Commits on Sep 6, 2018

  1. gambit: 4.8.9 -> 4.9.0

    @fare
    fare committed Sep 6, 2018
    Copy the full SHA
    c1219b6 View commit details

  2. gerbil: 0.12-RELEASE -> 0.13

    @fare
    fare committed Sep 6, 2018
    Copy the full SHA
    ccbb218 View commit details

  3. gambit-unstable: 2018-08-06 -> 2018-09-03

    @fare
    fare committed Sep 6, 2018
    Copy the full SHA
    7306e54 View commit details

  4. gerbil-unstable: 2018-08-11 -> 2018-09-06

    @fare
    fare committed Sep 6, 2018
    Copy the full SHA
    6c64d94 View commit details

Commits on Sep 11, 2018

  1. ocamlPackages.batteries: 2.8.0 -> 2.9.0

    @vbgl
    vbgl committed Sep 11, 2018
    Copy the full SHA
    65fcac8 View commit details

Commits on Sep 13, 2018

  1. ocamlPackages.batteries: disable tests on Aarch64

    @vbgl
    vbgl committed Sep 13, 2018
    Copy the full SHA
    1003e6e View commit details

Commits on Sep 16, 2018

  1. vimPlugins: adding vim-sayonara/nvimdev/obsession

    @teto
    teto committed Sep 16, 2018
    Copy the full SHA
    c4819da View commit details

  2. gnirehtet: 2.2.1 -> 2.3

    @dywedir
    dywedir committed Sep 16, 2018
    Copy the full SHA
    9501915 View commit details

  3. ipfs-migrator: 6 -> 7 

    New version is required to migrate existing ipfs repos to repo v7.
    @xeji
    xeji committed Sep 16, 2018
    Copy the full SHA
    6823fe9 View commit details

  4. ipfs-migrator: update dependencies in deps.nix 

    Most dependencies are vendored in the upstream source anyway,
deps.nix just contains the few that are not.
Dependencies were updated manually because go2nix doesn't
work correctly for this package - it produces an empty deps.nix.
    @xeji
    xeji committed Sep 16, 2018
    Copy the full SHA
    f896867 View commit details

  5. vivaldi: 1.15.1147.42-1 -> 1.15.1147.64-1

    @lluchs
    lluchs committed Sep 16, 2018
    Copy the full SHA
    eb275c9 View commit details

  6. vivaldi-ffmpeg-codecs: 61.0.3163.91 -> 69.0.3497.73

    @lluchs
    lluchs committed Sep 16, 2018
    Copy the full SHA
    478e1fe View commit details

Commits on Sep 17, 2018

  1. haskellPackages: Fix ListLike for 8.02 and 8.22

    @infinisil
    infinisil committed Sep 17, 2018
    Copy the full SHA
    7e5917a View commit details

  2. Merge pull request #46168 from fare-patches/master 

    New Gambit and Gerbil releases
    @7c6f434c
    7c6f434c authored Sep 17, 2018
    Copy the full SHA
    5cc6958 View commit details

  3. sierra-gtk-theme: init at 2018-09-14 (#46737)

    @romildo @xeji
    romildo authored and xeji committed Sep 17, 2018
    Copy the full SHA
    395019b View commit details

  4. libngspice: 26 -> 28 (#46225) 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
libngspice
    @r-ryantm @xeji
    r-ryantm authored and xeji committed Sep 17, 2018
    Copy the full SHA
    00c7f76 View commit details

  5. matomo: 3.5.1 -> 3.6.0 (#46242) 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
matomo
    @r-ryantm @xeji
    r-ryantm authored and xeji committed Sep 17, 2018
    Copy the full SHA
    c45dd04 View commit details

  6. libcouchbase: 2.9.2 -> 2.9.4 (#46254) 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
libcouchbase
    @r-ryantm @xeji
    r-ryantm authored and xeji committed Sep 17, 2018
    Copy the full SHA
    78372da View commit details

  7. arangodb: 3.3.14 -> 3.3.15 (#46305) 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/arangodb/versions
    @r-ryantm @xeji
    r-ryantm authored and xeji committed Sep 17, 2018
    Copy the full SHA
    37c3d6c View commit details

  8. Merge pull request #46532 from vbgl/ocaml-batteries-2.9.0 

    ocamlPackages.batteries: 2.8.0 -> 2.9.0
    @xeji
    xeji authored Sep 17, 2018
    Copy the full SHA
    19996db View commit details

  9. exim: add optional support for PAM (#46744)

    @pacien @xeji
    pacien authored and xeji committed Sep 17, 2018
    Copy the full SHA
    f607f45 View commit details

  10. nixos/lightdm: use systemd.tmpfiles (#46734) 

    This also makes logs appear at /var/log/lightdm
    @worldofpeace @xeji
    worldofpeace authored and xeji committed Sep 17, 2018
    Copy the full SHA
    67e9571 View commit details

  11. prometheus_2: 2.2.1 -> 2.3.2 (#46333)

    @mbode @xeji
    mbode authored and xeji committed Sep 17, 2018
    Copy the full SHA
    7c98b3d View commit details

  12. postman: 6.2.5 -> 6.3.0 (#46771)

    @rembo10 @xeji
    rembo10 authored and xeji committed Sep 17, 2018
    Copy the full SHA
    794c4ec View commit details

  13. gcolor3: 2.3 → 2.3.1

    @jtojnar
    jtojnar committed Sep 17, 2018
    Copy the full SHA
    eb9de57 View commit details

  14. linux: 4.19-rc3 -> 4.19-rc4

    @NeQuissimus
    NeQuissimus committed Sep 17, 2018
    Copy the full SHA
    8f52233 View commit details

  15. nixos tests doc: fix example statement 

    False statements don't cause NixOS tests to fail, we need to throw an
exception or terminate.
    @erikarvstedt
    erikarvstedt committed Sep 17, 2018
    Copy the full SHA
    b0956b0 View commit details

  16. nixos tests doc: add example statement

    @erikarvstedt
    erikarvstedt committed Sep 17, 2018
    Copy the full SHA
    6e203af View commit details

  17. Merge pull request #46735 from dywedir/gnirehtet 

    gnirehtet: 2.2.1 -> 2.3
    @Mic92
    Mic92 authored Sep 17, 2018
    Copy the full SHA
    f86e309 View commit details

  18. Merge pull request #46748 from teto/vim_plugins 

    vimPlugins: adding vim-sayonara/nvimdev/obsession
    @Mic92
    Mic92 authored Sep 17, 2018
    Copy the full SHA
    ffd74d1 View commit details

  19. nixos tests doc: update VM state path

    @erikarvstedt
    erikarvstedt committed Sep 17, 2018
    Copy the full SHA
    a91330a View commit details

  20. nixos display-managers: fix typo in description

    @erikarvstedt
    erikarvstedt committed Sep 17, 2018
    Copy the full SHA
    4c755e1 View commit details

  21. codimd: init at 1.2.0

    @WilliButz @globin
    WilliButz authored and globin committed Sep 17, 2018
    Copy the full SHA
    a31a917 View commit details

  22. nixos/codimd: add module

    @WilliButz @globin
    WilliButz authored and globin committed Sep 17, 2018
    Copy the full SHA
    db846a8 View commit details

  23. nixos/tests: add test for codimd

    @WilliButz @globin
    WilliButz authored and globin committed Sep 17, 2018
    Copy the full SHA
    dd5dcc6 View commit details

  24. nvramtool: init at 4.8.1 (#46774) 

    https://www.coreboot.org/Nvramtool
    @cryptix @xeji
    cryptix authored and xeji committed Sep 17, 2018
    Copy the full SHA
    fa58491 View commit details

  25. Merge pull request #46766 from Infinisil/fix/haskell/ListLike 

    haskellPackages: Fix ListLike for 8.02 and 8.22
    @peti
    peti authored Sep 17, 2018
    Copy the full SHA
    0d871ef View commit details

  26. vale: 0.11.2 -> 1.0.3 (#46780)

    @marsam @xeji
    marsam authored and xeji committed Sep 17, 2018
    Copy the full SHA
    fd34505 View commit details

  27. Merge pull request #46777 from erikarvstedt/docs 

    Improve docs
    @grahamc
    grahamc authored Sep 17, 2018
    Copy the full SHA
    c8cc8d4 View commit details

  28. grub: Use gcc6 

    GCC 7 wasn't kind to grub.
    @samueldr
    samueldr committed Sep 17, 2018
    Copy the full SHA
    ba09b05 View commit details

  29. grub: grub-0.97-patch-1.15 -> grub-0.97-73 

    Instead of using Gentoo's patchset, uses Debian's.

Gentoo's doesn't work anymore.
    @samueldr
    samueldr committed Sep 17, 2018
    Copy the full SHA
    932c8f4 View commit details

  30. nixos/tests/installer: grub1 needs /tmp to exist.

    @samueldr
    samueldr committed Sep 17, 2018
    Copy the full SHA
    b63c539 View commit details

  31. emby: 3.4.1.0 -> 3.5.2.0

    @worldofpeace
    worldofpeace committed Sep 17, 2018
    Copy the full SHA
    bd02b33 View commit details

  32. Merge pull request #46758 from lluchs/vivaldi-1.15.1147.64-1 

     vivaldi: 1.15.1147.42-1 -> 1.15.1147.64-1
    @xeji
    xeji authored Sep 17, 2018
    Copy the full SHA
    5c7406c View commit details

  33. win-virtio: 0.1.105-1 -> 0.1.141-1 (#46783)

    @lheckemann @xeji
    lheckemann authored and xeji committed Sep 17, 2018
    Copy the full SHA
    f11f709 View commit details

  34. zoom-us: 2.3.128305.0716 -> 2.4.129780.0915, QT downgrade (#46778) 

    Qt 5.11 was downgraded to 5.9 because of two issues:
- spawns errors like
```
qrc:/qml/SignInWaiting.qml:20:9: QML BusyIndicator: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:26:9: QML Text: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:20:9: QML BusyIndicator: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:26:9: QML Text: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:20:9: QML BusyIndicator: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:26:9: QML Text: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:20:9: QML BusyIndicator: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:26:9: QML Text: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:20:9: QML BusyIndicator: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:26:9: QML Text: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
```
- Google login doesn't work. It just doesn't start embedded webbrowser
    @danbst @xeji
    danbst authored and xeji committed Sep 17, 2018
    Copy the full SHA
    969a39b View commit details

  35. nixos/tor: Correct "transparent" typo

    @exarkun @globin
    exarkun authored and globin committed Sep 17, 2018
    Copy the full SHA
    57834da View commit details

  36. greybird: 3.22.7 -> 3.22.9

    @romildo
    romildo committed Sep 17, 2018
    Copy the full SHA
    9f46141 View commit details

  37. Merge pull request #46724 from worldofpeace/emby/3.5.2.0 

    emby: 3.4.1.0 -> 3.5.2.0
    @timokau
    timokau authored Sep 17, 2018
    Copy the full SHA
    3dfc66d View commit details

  38. bazel: 0.16.1 -> 0.17.1

    @uri-canva @Profpatsch
    uri-canva authored and Profpatsch committed Sep 17, 2018
    Copy the full SHA
    61dbb0c View commit details
Showing with 21,330 additions and 371 deletions.
  1. +7 −3 nixos/doc/manual/development/running-nixos-tests-interactively.xml
  2. +1 −1 nixos/doc/manual/development/writing-nixos-tests.xml
  3. +1 −0 nixos/modules/module-list.nix
  4. +1 −1 nixos/modules/services/security/tor.nix
  5. +958 −0 nixos/modules/services/web-apps/codimd.nix
  6. +1 −1 nixos/modules/services/x11/display-managers/default.nix
  7. +10 −3 nixos/modules/services/x11/display-managers/lightdm.nix
  8. +1 −0 nixos/release.nix
  9. +56 −0 nixos/tests/codimd.nix
  10. +1 −0 nixos/tests/installer.nix
  11. +8 −19 pkgs/applications/graphics/gcolor3/default.nix
  12. +0 −14 pkgs/applications/networking/browsers/vivaldi/chromium-gcc-r1.patch
  13. +0 −66 pkgs/applications/networking/browsers/vivaldi/chromium-gcc5-r1.patch
  14. +0 −27 pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r14.patch
  15. +2 −2 pkgs/applications/networking/browsers/vivaldi/default.nix
  16. +8 −13 pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
  17. +2 −1 pkgs/applications/networking/browsers/vivaldi/update.sh
  18. +2 −2 pkgs/applications/networking/instant-messengers/zoom-us/default.nix
  19. +3 −3 pkgs/applications/networking/ipfs-migrator/default.nix
  20. +4 −13 pkgs/applications/networking/ipfs-migrator/deps.nix
  21. +5 −6 pkgs/applications/virtualization/driver/win-virtio/default.nix
  22. +3 −3 pkgs/development/compilers/gambit/default.nix
  23. +4 −4 pkgs/development/compilers/gambit/unstable.nix
  24. +4 −4 pkgs/development/compilers/gerbil/default.nix
  25. +4 −4 pkgs/development/compilers/gerbil/unstable.nix
  26. +4 −0 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
  27. +3 −0 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
  28. +3 −4 pkgs/development/haskell-modules/make-package-set.nix
  29. +6 −3 pkgs/development/interpreters/php/default.nix
  30. +2 −2 pkgs/development/libraries/libcouchbase/default.nix
  31. +3 −3 pkgs/development/libraries/libngspice/default.nix
  32. +3 −7 pkgs/development/ocaml-modules/batteries/default.nix
  33. +42 −0 pkgs/development/python-modules/mahotas/disable-impure-tests.patch
  34. +9 −2 pkgs/development/tools/build-managers/bazel/default.nix
  35. +2 −2 pkgs/development/web/postman/default.nix
  36. +23 −10 pkgs/misc/themes/greybird/default.nix
  37. +33 −0 pkgs/misc/themes/sierra/default.nix
  38. +66 −36 pkgs/misc/vim-plugins/generated.nix
  39. +3 −0 pkgs/misc/vim-plugins/vim-plugin-names
  40. +3 −3 pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
  41. +3 −3 pkgs/os-specific/linux/kernel/linux-testing.nix
  42. +22 −13 pkgs/servers/emby/default.nix
  43. +8 −1 pkgs/servers/mail/exim/default.nix
  44. +2 −2 pkgs/servers/monitoring/prometheus/default.nix
  45. +2 −2 pkgs/servers/nosql/arangodb/default.nix
  46. +46 −0 pkgs/servers/web-apps/codimd/CodeMirror/default.nix
  47. +8 −0 pkgs/servers/web-apps/codimd/CodeMirror/deps.json
  48. +7 −0 pkgs/servers/web-apps/codimd/CodeMirror/generate.sh
  49. +1,459 −0 pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix
  50. +17 −0 pkgs/servers/web-apps/codimd/CodeMirror/node.nix
  51. +156 −0 pkgs/servers/web-apps/codimd/default.nix
  52. +150 −0 pkgs/servers/web-apps/codimd/deps.json
  53. +7 −0 pkgs/servers/web-apps/codimd/generate.sh
  54. +17,911 −0 pkgs/servers/web-apps/codimd/node-packages.nix
  55. +17 −0 pkgs/servers/web-apps/codimd/node.nix
  56. +2 −2 pkgs/servers/web-apps/matomo/default.nix
  57. +8 −30 pkgs/tools/misc/grub/default.nix
  58. +34 −0 pkgs/tools/misc/grub/grub1.patches.nix
  59. +70 −0 pkgs/tools/misc/grub/grub1.patches.sh
  60. +34 −0 pkgs/tools/misc/nvramtool/default.nix
  61. +4 −4 pkgs/tools/networking/gnirehtet/default.nix
  62. +19 −6 pkgs/tools/networking/gnirehtet/paths.patch
  63. +3 −3 pkgs/tools/text/vale/default.nix
  64. +42 −42 pkgs/tools/text/vale/deps.nix
  65. +8 −1 pkgs/top-level/all-packages.nix
10 changes: 7 additions & 3 deletions nixos/doc/manual/development/running-nixos-tests-interactively.xml
View file
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@ starting VDE switch for network 1
> startAll
> testScript
> $machine->succeed("touch /tmp/foo")
> print($machine->succeed("pwd"), "\n") # Show stdout of command
</screen>
The function <command>testScript</command> executes the entire test script
and drops you back into the test driver command line upon its completion.
@@ -33,8 +34,11 @@ $ nix-build nixos/tests/login.nix -A driver
$ ./result/bin/nixos-run-vms
</screen>
The script <command>nixos-run-vms</command> starts the virtual machines
defined by test. The root file system of the VMs is created on the fly and
kept across VM restarts in
<filename>./</filename><varname>hostname</varname><filename>.qcow2</filename>.
defined by test.
</para>

<para>
The machine state is kept across VM restarts in
<filename>/tmp/vm-state-</filename><varname>machinename</varname>.
</para>
</section>
2 changes: 1 addition & 1 deletion nixos/doc/manual/development/writing-nixos-tests.xml
View file
Original file line number Diff line number Diff line change
@@ -108,7 +108,7 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualis
<programlisting>
$machine->start;
$machine->waitForUnit("default.target");
$machine->succeed("uname") =~ /Linux/;
die unless $machine->succeed("uname") =~ /Linux/;
</programlisting>
The first line is actually unnecessary; machines are implicitly started when
you first execute an action on them (such as <literal>waitForUnit</literal>
1 change: 1 addition & 0 deletions nixos/modules/module-list.nix
View file
Original file line number Diff line number Diff line change
@@ -683,6 +683,7 @@
./services/web-apps/atlassian/confluence.nix
./services/web-apps/atlassian/crowd.nix
./services/web-apps/atlassian/jira.nix
./services/web-apps/codimd.nix
./services/web-apps/frab.nix
./services/web-apps/mattermost.nix
./services/web-apps/nexus.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/security/tor.nix
View file
Original file line number Diff line number Diff line change
@@ -208,7 +208,7 @@ in
enable = mkOption {
type = types.bool;
default = false;
description = "Whether to enable tor transaprent proxy";
description = "Whether to enable tor transparent proxy";
};

listenAddress = mkOption {
Loading