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: ad3172922613
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: 547466064e46
Choose a head ref
14 contributors

Commits on Jun 1, 2019

  1. drawpile: 2.1.8 -> 2.1.10 

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

  2. cargo-make: 0.19.3 -> 0.19.4

    @xrelkd
    xrelkd committed Jun 1, 2019
    Copy the full SHA
    e9d3a57 View commit details

  3. gede: 2.13.1 -> 2.14.1 

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

  4. gnome3.gnome-maps: 3.32.2 -> 3.32.2.1 

    https://gitlab.gnome.org/GNOME/gnome-maps/blob/v3.32.2.1/NEWS
    @worldofpeace
    worldofpeace committed Jun 1, 2019
    Copy the full SHA
    5624920 View commit details

  5. gnome3.gnome-control-center: 3.32.1 -> 3.32.2 

    https://gitlab.gnome.org/GNOME/gnome-control-center/blob/3.32.2/NEWS
    @worldofpeace
    worldofpeace committed Jun 1, 2019
    Copy the full SHA
    8d1292a View commit details

  6. gnome3.gnome-software: 3.32.2 -> 3.32.3 

    https://gitlab.gnome.org/GNOME/gnome-software/blob/3.32.3/NEWS
    @worldofpeace
    worldofpeace committed Jun 1, 2019
    Copy the full SHA
    6b01a3c View commit details

  7. gnome3.rygel: 0.38.0 -> 0.38.1 

    https://gitlab.gnome.org/GNOME/rygel/blob/rygel-0.38.1/NEWS
    @worldofpeace
    worldofpeace committed Jun 1, 2019
    Copy the full SHA
    4f692b1 View commit details

  8. gitg: 3.30.1 -> 3.32.0 

    * adds libdazzle
* intltool -> gettext
* hicolor-icon-theme as native for setup-hook
* re-enable tests

https://gitlab.gnome.org/GNOME/gitg/blob/v3.32.0/NEWS
    @worldofpeace
    worldofpeace committed Jun 1, 2019
    Copy the full SHA
    4c37b4a View commit details

  9. gnome3.gnome-nettool: correct typo

    @worldofpeace
    worldofpeace committed Jun 1, 2019
    Copy the full SHA
    027ccb8 View commit details

Commits on Jun 2, 2019

  1. compton: try not to conflict wintypes

    @eadwu
    eadwu committed Jun 2, 2019
    Copy the full SHA
    3207f7e View commit details

  2. gzdoom: Fix wrong fluidsynth version

    @Hodapp87
    Hodapp87 committed Jun 2, 2019
    Copy the full SHA
    cbb4aca View commit details

  3. python37Packages.XlsxWriter: 1.1.7 -> 1.1.8 

    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-xlsxwriter/versions
    @r-ryantm
    r-ryantm committed Jun 2, 2019
    Copy the full SHA
    eef54c2 View commit details

Commits on Jun 3, 2019

  1. skypeforlinux: 8.44.0.40 -> 8.45.0.41 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/skypeforlinux/versions
    @r-ryantm
    r-ryantm committed Jun 3, 2019
    Copy the full SHA
    dcbb041 View commit details

  2. src: 1.25 -> 1.26 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/src/versions
    @r-ryantm
    r-ryantm committed Jun 3, 2019
    Copy the full SHA
    4478416 View commit details

  3. tpm2-tss: 2.2.2 -> 2.2.3 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tpm2-tss/versions
    @r-ryantm
    r-ryantm committed Jun 3, 2019
    Copy the full SHA
    7080e6e View commit details

  4. nixos/btsync: remove 

    Remove the btsync module. Bittorrent Sync was renamed to Resilio Sync in
2016, which is supported by the resilio module. Since Resilio Sync had
some security updates since 2016, it is not safe to run Bittorrent Sync
anymore.
    @danieldk
    danieldk committed Jun 3, 2019
    Copy the full SHA
    c619bbb View commit details

  5. bittorrentSync: remove

    @danieldk
    danieldk committed Jun 3, 2019
    Copy the full SHA
    3093e35 View commit details

  6. nixos/release-notes: mention removal of Bittorrent Sync

    @danieldk
    danieldk committed Jun 3, 2019
    Copy the full SHA
    344ccd0 View commit details

  7. urlscan: 0.9.2 -> 0.9.3 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/urlscan/versions
    @r-ryantm
    r-ryantm committed Jun 3, 2019
    Copy the full SHA
    97903f3 View commit details

  8. xterm: 345 -> 346 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xterm/versions
    @r-ryantm
    r-ryantm committed Jun 3, 2019
    Copy the full SHA
    e80724f View commit details

  9. you-get: 0.4.1295 -> 0.4.1302 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/you-get/versions
    @r-ryantm
    r-ryantm committed Jun 3, 2019
    Copy the full SHA
    e20966d View commit details

  10. zim: 0.71.0 -> 0.71.1 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/zim/versions
    @r-ryantm
    r-ryantm committed Jun 3, 2019
    Copy the full SHA
    376b967 View commit details

  11. gbenchmark: 1.4.1 -> 1.5.0

    @abbradar
    abbradar committed Jun 3, 2019
    Copy the full SHA
    80bf658 View commit details

  12. paperkey: use HTTPS

    @asymmetric
    asymmetric committed Jun 3, 2019
    Copy the full SHA
    43a65d7 View commit details

  13. qpdf: 8.4.1 -> 8.4.2 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qpdf/versions
    @r-ryantm @abbradar
    r-ryantm authored and abbradar committed Jun 3, 2019
    Copy the full SHA
    70204c2 View commit details

  14. Merge pull request #62538 from Hodapp87/master 

    gzdoom: Fix wrong fluidsynth version
    @Mic92
    Mic92 authored Jun 3, 2019
    Copy the full SHA
    78a3654 View commit details

  15. Merge pull request #62600 from asymmetric/paperkey 

    paperkey: use HTTPS
    @Mic92
    Mic92 authored Jun 3, 2019
    Copy the full SHA
    96ec038 View commit details

  16. Merge pull request #62529 from danieldk/remove-btsync-module 

    nixos/btsync: remove
    @Mic92
    Mic92 authored Jun 3, 2019
    Copy the full SHA
    e8e1dc7 View commit details

  17. skypeforlinux: 8.44.0.40 -> 8.45.0.41 (#62569) 

    skypeforlinux: 8.44.0.40 -> 8.45.0.41
    @Mic92
    Mic92 authored Jun 3, 2019
    Copy the full SHA
    51d3d5b View commit details

  18. Merge pull request #62596 from r-ryantm/auto-update/xterm 

    xterm: 345 -> 346
    @Ma27
    Ma27 authored Jun 3, 2019
    Copy the full SHA
    c2b83ea View commit details

  19. Merge pull request #62427 from worldofpeace/gnome-updates 

    Some GNOME3 updates (again)
    @hedning
    hedning authored Jun 3, 2019
    Copy the full SHA
    ebd379e View commit details

  20. Merge pull request #62416 from r-ryantm/auto-update/gede 

    gede: 2.13.1 -> 2.14.1
    @ryantm
    ryantm authored Jun 3, 2019
    Copy the full SHA
    1c090da View commit details

  21. Merge pull request #62579 from r-ryantm/auto-update/tpm2-tss 

    tpm2-tss: 2.2.2 -> 2.2.3
    @ryantm
    ryantm authored Jun 3, 2019
    Copy the full SHA
    33c0d28 View commit details

  22. Merge pull request #62388 from r-ryantm/auto-update/drawpile 

    drawpile: 2.1.8 -> 2.1.10
    @ryantm
    ryantm authored Jun 3, 2019
    Copy the full SHA
    9555f0b View commit details

  23. Merge pull request #62598 from r-ryantm/auto-update/zim 

    zim: 0.71.0 -> 0.71.1
    @ryantm
    ryantm authored Jun 3, 2019
    Copy the full SHA
    106e639 View commit details

  24. Merge pull request #62597 from r-ryantm/auto-update/you-get 

    you-get: 0.4.1295 -> 0.4.1302
    @ryantm
    ryantm authored Jun 3, 2019
    Copy the full SHA
    6d2df40 View commit details

  25. Merge pull request #62584 from r-ryantm/auto-update/urlscan 

    urlscan: 0.9.2 -> 0.9.3
    @ryantm
    ryantm authored Jun 3, 2019
    Copy the full SHA
    1a28cf8 View commit details

  26. Merge pull request #62548 from r-ryantm/auto-update/python3.7-XlsxWriter 

    python37Packages.XlsxWriter: 1.1.7 -> 1.1.8
    @marsam
    marsam authored Jun 3, 2019
    Copy the full SHA
    15989fb View commit details

  27. src: 1.25 -> 1.26 (#62576) 

    src: 1.25 -> 1.26
    @Mic92
    Mic92 authored Jun 3, 2019
    Copy the full SHA
    37e4161 View commit details

  28. python37Packages.stripe: 2.27.0 -> 2.29.3 

    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-stripe/versions
    @r-ryantm @marsam
    r-ryantm authored and marsam committed Jun 3, 2019
    Copy the full SHA
    25fb890 View commit details

  29. Merge pull request #62528 from eadwu/compton/wintypes-conflict 

    compton: try not to conflict wintypes
    @Ma27
    Ma27 authored Jun 3, 2019
    Copy the full SHA
    0dbdb2e View commit details

  30. Merge pull request #62543 from r-ryantm/auto-update/python3.7-stripe 

    python37Packages.stripe: 2.27.0 -> 2.29.0
    @marsam
    marsam authored Jun 3, 2019
    Copy the full SHA
    3e8696f View commit details

  31. python37Packages.uncertainties: 3.0.3 -> 3.1.1 

    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-uncertainties/versions
    @r-ryantm @marsam
    r-ryantm authored and marsam committed Jun 3, 2019
    Copy the full SHA
    4ae62e2 View commit details

  32. Merge pull request #62547 from r-ryantm/auto-update/python3.7-uncerta… 

    …inties

python37Packages.uncertainties: 3.0.3 -> 3.1
    @marsam
    marsam authored Jun 3, 2019
    Copy the full SHA
    15017d6 View commit details

  33. libxls: 1.4.0 -> 1.5.1

    @abbradar
    abbradar committed Jun 3, 2019
    Copy the full SHA
    d5b8080 View commit details

  34. libsForQt5.qtwebkit-plugins: 2015-05-09 -> 2017-01-25

    @abbradar
    abbradar committed Jun 3, 2019
    Copy the full SHA
    28bd05c View commit details

  35. python27Packages.python-stdnum: 1.10 -> 1.11 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python2.7-python-stdnum/versions
    @r-ryantm @marsam
    r-ryantm authored and marsam committed Jun 3, 2019
    Copy the full SHA
    a0d1442 View commit details

  36. Merge pull request #62539 from r-ryantm/auto-update/python2.7-python-… 

    …stdnum

python27Packages.python-stdnum: 1.10 -> 1.11
    @marsam
    marsam authored Jun 3, 2019
    Copy the full SHA
    168d253 View commit details

  37. Merge pull request #62404 from xrelkd/update/cargo-make 

    cargo-make: 0.19.3 -> 0.19.4
    @marsam
    marsam authored Jun 3, 2019
    Copy the full SHA
    7531309 View commit details

  38. ocamlPackages.merlin: 3.2.2 -> 3.3.0

    @marsam @vbgl
    marsam authored and vbgl committed Jun 3, 2019
    Copy the full SHA
    ddaf94d View commit details
Showing with 242 additions and 514 deletions.
  1. +12 −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. +0 −324 nixos/modules/services/networking/btsync.nix
  5. +25 −11 nixos/modules/services/x11/compton.nix
  6. +2 −2 pkgs/applications/graphics/drawpile/default.nix
  7. +2 −2 pkgs/applications/misc/urlscan/default.nix
  8. +2 −2 pkgs/applications/misc/xterm/default.nix
  9. +0 −9 pkgs/applications/networking/bittorrentsync/1.4.x.nix
  10. +0 −9 pkgs/applications/networking/bittorrentsync/2.0.x.nix
  11. +0 −41 pkgs/applications/networking/bittorrentsync/generic.nix
  12. +2 −2 pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
  13. +2 −2 pkgs/applications/office/zim/default.nix
  14. +2 −2 pkgs/applications/version-management/src/default.nix
  15. +2 −2 pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
  16. +1 −1 pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
  17. +2 −2 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
  18. +2 −2 pkgs/desktops/gnome-3/core/gnome-software/default.nix
  19. +2 −2 pkgs/desktops/gnome-3/core/rygel/default.nix
  20. +14 −11 pkgs/desktops/gnome-3/misc/gitg/default.nix
  21. +18 −8 pkgs/development/coq-modules/mathcomp/default.nix
  22. +55 −13 pkgs/development/coq-modules/mathcomp/extra.nix
  23. +7 −3 pkgs/development/libraries/gbenchmark/default.nix
  24. +4 −3 pkgs/development/libraries/libxls/default.nix
  25. +2 −2 pkgs/development/libraries/qpdf/default.nix
  26. +3 −3 pkgs/development/libraries/qtwebkit-plugins/default.nix
  27. +2 −2 pkgs/development/libraries/tpm2-tss/default.nix
  28. +2 −2 pkgs/development/python-modules/XlsxWriter/default.nix
  29. +10 −5 pkgs/development/python-modules/python-stdnum/default.nix
  30. +9 −6 pkgs/development/python-modules/stripe/default.nix
  31. +2 −2 pkgs/development/python-modules/uncertainties/default.nix
  32. +2 −2 pkgs/development/tools/misc/gede/default.nix
  33. +8 −6 pkgs/development/tools/ocaml/merlin/default.nix
  34. +5 −5 pkgs/development/tools/rust/cargo-make/default.nix
  35. +2 −2 pkgs/games/gzdoom/default.nix
  36. +2 −2 pkgs/tools/misc/you-get/default.nix
  37. +2 −2 pkgs/tools/security/paperkey/default.nix
  38. +3 −0 pkgs/top-level/aliases.nix
  39. +0 −4 pkgs/top-level/all-packages.nix
  40. +30 −13 pkgs/top-level/coq-packages.nix
12 changes: 12 additions & 0 deletions nixos/doc/manual/release-notes/rl-1909.xml
View file
Original file line number Diff line number Diff line change
@@ -112,6 +112,18 @@
</link>
</para>
</listitem>
<listitem>
<para>
Since Bittorrent Sync was superseded by Resilio Sync in 2016, the
<literal>bittorrentSync</literal>, <literal>bittorrentSync14</literal>,
and <literal>bittorrentSync16</literal> packages have been removed in
favor of <literal>resilio-sync</literal>.
</para>
<para>
The corresponding module, <option>services.btsync</option> has been
replaced by the <option>services.resilio</option> module.
</para>
</listitem>
<listitem>
<para>
The limesurvey apache subservice was replaced with a full NixOS module.
4 changes: 2 additions & 2 deletions nixos/modules/misc/ids.nix
View file
Original file line number Diff line number Diff line change
@@ -145,7 +145,7 @@
#notbit = 111; # unused
aerospike = 111;
ngircd = 112;
btsync = 113;
#btsync = 113; # unused
minecraft = 114;
vault = 115;
rippled = 116;
@@ -457,7 +457,7 @@
#notbit = 111; # unused
aerospike = 111;
#ngircd = 112; # unused
btsync = 113;
#btsync = 113; # unused
#minecraft = 114; # unused
vault = 115;
#ripped = 116; # unused
1 change: 0 additions & 1 deletion nixos/modules/module-list.nix
View file
Original file line number Diff line number Diff line change
@@ -541,7 +541,6 @@
./services/networking/autossh.nix
./services/networking/bird.nix
./services/networking/bitlbee.nix
./services/networking/btsync.nix
./services/networking/charybdis.nix
./services/networking/chrony.nix
./services/networking/cjdns.nix
324 changes: 0 additions & 324 deletions nixos/modules/services/networking/btsync.nix
View file

This file was deleted.

Loading