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: af9f401b9a43
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: 4ca0df153908
Choose a head ref

Commits on Aug 19, 2019

  1. Copy the full SHA
    6eec415 View commit details
  2. mcelog: 162 -> 164

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/mcelog/versions
    r-ryantm committed Aug 19, 2019
    Copy the full SHA
    1c0ea2c View commit details

Commits on Aug 20, 2019

  1. lxqt: use qt5's mkDerivation

    This should also ensure that the applications get wrapped
    appropriately.
    worldofpeace committed Aug 20, 2019
    Copy the full SHA
    3167eb3 View commit details
  2. python37Packages.django_modelcluster: 4.4 -> 5.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/python3.7-django-modelcluster/versions
    r-ryantm committed Aug 20, 2019
    Copy the full SHA
    2c8a0aa View commit details

Commits on Aug 21, 2019

  1. uwimap: Fixed cross-compilation

    Shouldn't cause a rebuild of native package. The build system, as with
    Lua, couldn't find cc, ar and ranlib - I helped it a little.
    Vika committed Aug 21, 2019
    Copy the full SHA
    a2b474b View commit details

Commits on Aug 22, 2019

  1. lxqt: use modified LXQtConfigVars CMake macro

    LXQt uses the values in this macro to set installation
    directories and in the case of lxqt-session to substitute in paths.
    However, by doing this all the paths are from within lxqt-build-tools
    prefix. By utilizing a setup hook we can set the directories with the
    correct prefix as cmake flags.
    worldofpeace committed Aug 22, 2019
    Copy the full SHA
    e34de04 View commit details
  2. dlib: 19.16 -> 19.17

    https://github.com/davisking/dlib/releases/tag/v19.17
    
    Also had to change the expression for setup.py flags as 19.17 doesn't
    support `--yes` anymore.
    Ma27 committed Aug 22, 2019
    Copy the full SHA
    311516f View commit details

Commits on Aug 24, 2019

  1. Copy the full SHA
    885511c View commit details
  2. ssb-patchwork: 3.14.1 -> 3.16.2

    - Updating patchwork to 3.16.2.
    - Renaming the binary to `ssb-patchwork` to prevent naming collision
      with graphviz's `patchwork`.
    picnoir committed Aug 24, 2019
    Copy the full SHA
    b148b4d View commit details
  3. Copy the full SHA
    e3e3af2 View commit details
  4. Copy the full SHA
    de0b514 View commit details

Commits on Aug 25, 2019

  1. Copy the full SHA
    7f7d8b1 View commit details
  2. Copy the full SHA
    8ecc58f View commit details
  3. evcxr: 0.3.3 -> 0.4.3

    The current version fails to build: https://hydra.nixos.org/build/99189245
    
    Please note that the releases aren't tracked by Git, but the currently
    used rev points to `0.4.3` at crates.io: https://crates.io/crates/evcxr/0.4.3
    Ma27 committed Aug 25, 2019
    Copy the full SHA
    62b75df View commit details
  4. Merge pull request #67408 from Ma27/bump-evcxr

    evcxr: 0.3.3 -> 0.4.3
    worldofpeace authored Aug 25, 2019
    Copy the full SHA
    f188bad View commit details
  5. Copy the full SHA
    02388c0 View commit details
  6. Copy the full SHA
    17775d5 View commit details
  7. Copy the full SHA
    c3e93d5 View commit details
  8. Copy the full SHA
    de81511 View commit details
  9. Copy the full SHA
    9c167ef View commit details
  10. Merge pull request #67429 from marsam/fix-ocurl

    ocamlPackages.ocurl: disable for ocaml<4.02
    marsam authored Aug 25, 2019
    Copy the full SHA
    b048cf5 View commit details
  11. Copy the full SHA
    d97274a View commit details
  12. Merge pull request #66968 from r-ryantm/auto-update/mcelog

    mcelog: 162 -> 164
    marsam authored Aug 25, 2019
    Copy the full SHA
    cf99696 View commit details
  13. Merge pull request #67054 from r-ryantm/auto-update/python3.7-django-…

    …modelcluster
    
    python37Packages.django_modelcluster: 4.4 -> 5.0
    marsam authored Aug 25, 2019
    Copy the full SHA
    9a733a8 View commit details
  14. Merge pull request #67290 from Ma27/bump-dlib

    dlib: 19.16 -> 19.17
    mmahut authored Aug 25, 2019
    Copy the full SHA
    7bdda40 View commit details
  15. sdrangel: init at 4.11.7

    alkeryn committed Aug 25, 2019
    Copy the full SHA
    a98de94 View commit details
  16. Merge pull request #67391 from avnik/drop-rmilter

    rmilter: remove deprecated package (and module)
    mmahut authored Aug 25, 2019
    Copy the full SHA
    9ffc980 View commit details
  17. Merge pull request #67400 from risicle/ris-django-silk-3.0.3

    pythonPackages.django_silk: 3.0.2 -> 3.0.3
    mmahut authored Aug 25, 2019
    Copy the full SHA
    264b415 View commit details
  18. Merge pull request #67401 from c0deaddict/feature/upgrade-moderngl

    python3Packages.moderngl: 5.5.0 -> 5.5.3
    mmahut authored Aug 25, 2019
    Copy the full SHA
    cfeaae9 View commit details
  19. Merge pull request #67202 from kisik21/uwimap-cross-compile-fix

    uwimap: Fixed cross-compilation
    mmahut authored Aug 25, 2019
    Copy the full SHA
    d212d86 View commit details
  20. Merge pull request #67388 from NinjaTrappeur/nin-update-ssb-patchwork

    ssb-patchwork: 3.14.1 -> 3.16.2
    mmahut authored Aug 25, 2019
    Copy the full SHA
    2d54a79 View commit details
  21. Merge pull request #67431 from masaeedu/patch-1

    flashplayer: 32.0.0.223 -> 32.0.0.238
    mmahut authored Aug 25, 2019
    Copy the full SHA
    7d0adb4 View commit details
  22. vampire: 4.2.2 -> 4.4

    gebner committed Aug 25, 2019
    Copy the full SHA
    440c63a View commit details
  23. Merge pull request #67436 from dasJ/update-rainloop

    rainloop-standard: Update as well
    mmahut authored Aug 25, 2019
    Copy the full SHA
    02dd0be View commit details
  24. Merge pull request #67435 from marenz2569/caldav-patch

    python: caldav: fixed dependencies
    mmahut authored Aug 25, 2019
    Copy the full SHA
    28d2739 View commit details
  25. Merge pull request #67357 from Alkeryn/master

    sdrangel : init at 4.11.7
    markuskowa authored Aug 25, 2019
    Copy the full SHA
    b27b627 View commit details
  26. Copy the full SHA
    25cae26 View commit details
  27. Merge pull request #67440 from gebner/vampire44

    vampire: 4.2.2 -> 4.4
    gebner authored Aug 25, 2019
    Copy the full SHA
    26e64d3 View commit details
  28. nano: 4.3 -> 4.4

    lsix committed Aug 25, 2019
    Copy the full SHA
    d168db6 View commit details
  29. Copy the full SHA
    44e4b2e View commit details
  30. linux: 4.19.67 -> 4.19.68

    NeQuissimus committed Aug 25, 2019
    Copy the full SHA
    016e37b View commit details
  31. linux: 4.4.189 -> 4.4.190

    NeQuissimus committed Aug 25, 2019
    Copy the full SHA
    5c32c5e View commit details
  32. linux: 4.9.189 -> 4.9.190

    NeQuissimus committed Aug 25, 2019
    Copy the full SHA
    4658568 View commit details
  33. Copy the full SHA
    e19411e View commit details
  34. nixos/memcached: Remove PrivateUsers

    Seems to break systems using the hardened profile.
    Ref #62936
    cc @Izorkin
    dasJ committed Aug 25, 2019
    Copy the full SHA
    cabab90 View commit details
  35. Copy the full SHA
    73f67bc View commit details
  36. stig: init at 0.10.1a0 (#67233)

    doronbehar authored and timokau committed Aug 25, 2019
    Copy the full SHA
    1859271 View commit details
  37. Merge pull request #67393 from c0deaddict/feature/transmission-user-c…

    …onfigurable
    
    nixos/transmission: make user configurable
    aanderse authored Aug 25, 2019
    Copy the full SHA
    5b8c229 View commit details
  38. Merge pull request #67419 from eadwu/python3Packages.aiosmtpd/1.2.1

    python3Packages.aiodmtpd: 1.2 -> 1.2.1
    mmahut authored Aug 25, 2019
    Copy the full SHA
    2f090bb View commit details
  39. Merge pull request #67420 from eadwu/pythonPackages.sqlalchemy-utils/…

    …0.34.2
    
    pythonPackages.sqlalchemy-utils: 0.34.0 -> 0.34.2
    mmahut authored Aug 25, 2019
    Copy the full SHA
    b7f8ebf View commit details
Showing with 1,312 additions and 1,840 deletions.
  1. +6 −0 nixos/doc/manual/release-notes/rl-1909.xml
  2. +2 −2 nixos/modules/misc/ids.nix
  3. +0 −1 nixos/modules/module-list.nix
  4. +2 −2 nixos/modules/rename.nix
  5. +0 −1 nixos/modules/services/databases/memcached.nix
  6. +0 −252 nixos/modules/services/mail/rmilter.nix
  7. +27 −9 nixos/modules/services/torrent/transmission.nix
  8. +2 −2 pkgs/applications/editors/nano/default.nix
  9. +4 −4 pkgs/applications/networking/browsers/chromium/plugins.nix
  10. +2 −2 pkgs/applications/networking/browsers/vivaldi/default.nix
  11. +2 −2 pkgs/applications/networking/instant-messengers/slack/default.nix
  12. +56 −0 pkgs/applications/networking/p2p/stig/default.nix
  13. +6 −6 pkgs/applications/networking/ssb/patchwork/default.nix
  14. +74 −0 pkgs/applications/radio/sdrangel/default.nix
  15. +4 −7 pkgs/applications/science/logic/vampire/default.nix
  16. +2 −2 pkgs/applications/version-management/blackbox/default.nix
  17. +3 −3 pkgs/desktops/lxqt/compton-conf/default.nix
  18. +3 −3 pkgs/desktops/lxqt/libfm-qt/default.nix
  19. +3 −10 pkgs/desktops/lxqt/liblxqt/default.nix
  20. +3 −3 pkgs/desktops/lxqt/libqtxdg/default.nix
  21. +3 −3 pkgs/desktops/lxqt/libsysstat/default.nix
  22. +3 −3 pkgs/desktops/lxqt/lximage-qt/default.nix
  23. +3 −8 pkgs/desktops/lxqt/lxqt-about/default.nix
  24. +3 −8 pkgs/desktops/lxqt/lxqt-admin/default.nix
  25. +3 −4 pkgs/desktops/lxqt/lxqt-archiver/default.nix
  26. +7 −0 pkgs/desktops/lxqt/lxqt-build-tools/LXQtConfigVars.cmake
  27. +12 −5 pkgs/desktops/lxqt/lxqt-build-tools/default.nix
  28. +15 −0 pkgs/desktops/lxqt/lxqt-build-tools/setup-hook.sh
  29. +3 −20 pkgs/desktops/lxqt/lxqt-config/default.nix
  30. +3 −13 pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
  31. +3 −13 pkgs/desktops/lxqt/lxqt-notificationd/default.nix
  32. +3 −8 pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
  33. +3 −17 pkgs/desktops/lxqt/lxqt-panel/default.nix
  34. +3 −11 pkgs/desktops/lxqt/lxqt-policykit/default.nix
  35. +3 −13 pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
  36. +3 −3 pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
  37. +3 −11 pkgs/desktops/lxqt/lxqt-runner/default.nix
  38. +3 −15 pkgs/desktops/lxqt/lxqt-session/default.nix
  39. +3 −8 pkgs/desktops/lxqt/lxqt-sudo/default.nix
  40. +3 −10 pkgs/desktops/lxqt/lxqt-themes/default.nix
  41. +3 −3 pkgs/desktops/lxqt/obconf-qt/default.nix
  42. +3 −3 pkgs/desktops/lxqt/pavucontrol-qt/default.nix
  43. +3 −10 pkgs/desktops/lxqt/pcmanfm-qt/default.nix
  44. +3 −3 pkgs/desktops/lxqt/qlipper/default.nix
  45. +3 −3 pkgs/desktops/lxqt/qps/default.nix
  46. +3 −3 pkgs/desktops/lxqt/qterminal/default.nix
  47. +4 −4 pkgs/desktops/lxqt/qtermwidget/default.nix
  48. +3 −3 pkgs/desktops/lxqt/screengrab/default.nix
  49. +0 −684 pkgs/development/interpreters/evcxr/cargo-lock.patch
  50. +7 −8 pkgs/development/interpreters/evcxr/default.nix
  51. +2 −2 pkgs/development/libraries/dlib/default.nix
  52. +1 −0 pkgs/development/node-packages/node-packages-v10.json
  53. +893 −446 pkgs/development/node-packages/node-packages-v10.nix
  54. +25 −15 pkgs/development/node-packages/node-packages-v12.nix
  55. +4 −0 pkgs/development/ocaml-modules/ocurl/default.nix
  56. +8 −5 pkgs/development/python-modules/aiosmtpd/default.nix
  57. +2 −2 pkgs/development/python-modules/caldav/default.nix
  58. +5 −2 pkgs/development/python-modules/django_modelcluster/default.nix
  59. +2 −2 pkgs/development/python-modules/django_silk/default.nix
  60. +9 −3 pkgs/development/python-modules/dlib/default.nix
  61. +3 −3 pkgs/development/python-modules/moderngl/default.nix
  62. +2 −2 pkgs/development/python-modules/sqlalchemy-utils/default.nix
  63. +2 −2 pkgs/games/steam/steam.nix
  64. +2 −2 pkgs/os-specific/linux/kernel/linux-4.14.nix
  65. +2 −2 pkgs/os-specific/linux/kernel/linux-4.19.nix
  66. +2 −2 pkgs/os-specific/linux/kernel/linux-4.4.nix
  67. +2 −2 pkgs/os-specific/linux/kernel/linux-4.9.nix
  68. +2 −2 pkgs/os-specific/linux/mcelog/default.nix
  69. +0 −33 pkgs/servers/mail/rmilter/default.nix
  70. +0 −80 pkgs/servers/mail/rmilter/fd-passing-libmilter.patch
  71. +1 −1 pkgs/servers/rainloop/default.nix
  72. +6 −17 pkgs/tools/misc/vdirsyncer/default.nix
  73. +11 −3 pkgs/tools/networking/uwimap/default.nix
  74. +8 −4 pkgs/top-level/all-packages.nix
6 changes: 6 additions & 0 deletions nixos/doc/manual/release-notes/rl-1909.xml
Original file line number Diff line number Diff line change
@@ -506,6 +506,12 @@
been removed.
</para>
</listitem>
<listitem>
<para>
The <literal>rmilter</literal> package was removed with associated module and options due deprecation by upstream developer.
Use <literal>rspamd</literal> in proxy mode instead.
</para>
</listitem>
</itemizedlist>
</section>
</section>
4 changes: 2 additions & 2 deletions nixos/modules/misc/ids.nix
Original file line number Diff line number Diff line change
@@ -251,7 +251,7 @@
gale = 223;
matrix-synapse = 224;
rspamd = 225;
rmilter = 226;
# rmilter = 226; # unused, removed 2019-08-22
cfdyndns = 227;
gammu-smsd = 228;
pdnsd = 229;
@@ -559,7 +559,7 @@
gale = 223;
matrix-synapse = 224;
rspamd = 225;
rmilter = 226;
# rmilter = 226; # unused, removed 2019-08-22
cfdyndns = 227;
pdnsd = 229;
octoprint = 230;
1 change: 0 additions & 1 deletion nixos/modules/module-list.nix
Original file line number Diff line number Diff line change
@@ -387,7 +387,6 @@
./services/mail/spamassassin.nix
./services/mail/rspamd.nix
./services/mail/rss2email.nix
./services/mail/rmilter.nix
./services/mail/roundcube.nix
./services/mail/nullmailer.nix
./services/misc/airsonic.nix
4 changes: 2 additions & 2 deletions nixos/modules/rename.nix
Original file line number Diff line number Diff line change
@@ -72,8 +72,8 @@ with lib;
# PAM
(mkRenamedOptionModule [ "security" "pam" "enableU2F" ] [ "security" "pam" "u2f" "enable" ])

(mkRemovedOptionModule [ "services" "rmilter" "bindInetSockets" ] "Use services.rmilter.bindSocket.* instead")
(mkRemovedOptionModule [ "services" "rmilter" "bindUnixSockets" ] "Use services.rmilter.bindSocket.* instead")
# rmilter/rspamd
(mkRemovedOptionModule [ "services" "rmilter" ] "Use services.rspamd.* instead to set up milter service")

# Xsession script
(mkRenamedOptionModule [ "services" "xserver" "displayManager" "job" "logsXsession" ] [ "services" "xserver" "displayManager" "job" "logToFile" ])
1 change: 0 additions & 1 deletion nixos/modules/services/databases/memcached.nix
Original file line number Diff line number Diff line change
@@ -103,7 +103,6 @@ in
LockPersonality = true;
RestrictRealtime = true;
PrivateMounts = true;
PrivateUsers = true;
MemoryDenyWriteExecute = true;
};
};
252 changes: 0 additions & 252 deletions nixos/modules/services/mail/rmilter.nix

This file was deleted.

36 changes: 27 additions & 9 deletions nixos/modules/services/torrent/transmission.nix
Original file line number Diff line number Diff line change
@@ -84,6 +84,18 @@ in
The directory where transmission will create files.
'';
};

user = mkOption {
type = types.str;
default = "transmission";
description = "User account under which Transmission runs.";
};

group = mkOption {
type = types.str;
default = "transmission";
description = "Group account under which Transmission runs.";
};
};
};

@@ -99,22 +111,28 @@ in
serviceConfig.ExecStartPre = preStart;
serviceConfig.ExecStart = "${pkgs.transmission}/bin/transmission-daemon -f --port ${toString config.services.transmission.port}";
serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
serviceConfig.User = "transmission";
serviceConfig.User = cfg.user;
serviceConfig.Group = cfg.group;
# NOTE: transmission has an internal umask that also must be set (in settings.json)
serviceConfig.UMask = "0002";
};

# It's useful to have transmission in path, e.g. for remote control
environment.systemPackages = [ pkgs.transmission ];

users.groups.transmission.gid = config.ids.gids.transmission;
users.users.transmission = {
group = "transmission";
uid = config.ids.uids.transmission;
description = "Transmission BitTorrent user";
home = homeDir;
createHome = true;
};
users.users = optionalAttrs (cfg.user == "transmission") (singleton
{ name = "transmission";
group = cfg.group;
uid = config.ids.uids.transmission;
description = "Transmission BitTorrent user";
home = homeDir;
createHome = true;
});

users.groups = optionalAttrs (cfg.group == "transmission") (singleton
{ name = "transmission";
gid = config.ids.gids.transmission;
});

# AppArmor profile
security.apparmor.profiles = mkIf apparmor [
4 changes: 2 additions & 2 deletions pkgs/applications/editors/nano/default.nix
Original file line number Diff line number Diff line change
@@ -20,11 +20,11 @@ let

in stdenv.mkDerivation rec {
name = "nano-${version}";
version = "4.3";
version = "4.4";

src = fetchurl {
url = "mirror://gnu/nano/${name}.tar.xz";
sha256 = "108dzj6azqmini9bvgl26r0q1y59s3nnrw75hfzv91bs50davlq0";
sha256 = "1iw2ypq34g1gfqyhgka2fz5yj5vrlz85q6zk7amgyj286ph25wia";
};

nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
Loading