Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c500bb198cc1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 456ee571dd95
Choose a head ref
16 contributors

Commits on Apr 30, 2021

  1. redmine: 4.1.2 -> 4.1.3

    @aanderse
    aanderse committed Apr 30, 2021
    Copy the full SHA
    e3d4132 View commit details

Commits on May 3, 2021

  1. perlPackages.ImageExifTool: apply fix for CVE-2021-22204

    @midchildan
    midchildan committed May 3, 2021
    Copy the full SHA
    43ed87f View commit details

  2. Merge pull request #121281 from aanderse/redmine-backport 

    [20.09] redmine: 4.1.2 -> 4.1.3
    @SuperSandro2000
    SuperSandro2000 authored May 3, 2021
    Copy the full SHA
    b81d252 View commit details

  3. Merge pull request #121568 from midchildan/backport/20.09/exiftool 

    [20.09] perlPackages.ImageExifTool: apply fix for CVE-2021-22204
    @matthewbauer
    matthewbauer authored May 3, 2021
    Copy the full SHA
    4a154d4 View commit details

  4. Merge branch 'staging-20.09' into release-20.09

    @vcunat
    vcunat committed May 3, 2021
    Copy the full SHA
    a565a21 View commit details

Commits on May 4, 2021

  1. exim: 4.94 -> 4.94.2 

    Fixes a dozen security vulnerabilities

(cherry picked from commit 8a249aa)
    @ajs124
    ajs124 committed May 4, 2021
    Copy the full SHA
    2ee9a4f View commit details

  2. tcpreplay: 4.3.3 -> 4.3.4 

    https://github.com/appneta/tcpreplay/releases/tag/v4.3.4
(cherry picked from commit f50700d)
    @dotlambda @Ma27
    dotlambda authored and Ma27 committed May 4, 2021
    Copy the full SHA
    f39bdc3 View commit details

  3. lib/licenses: add missing bsdOriginalUC 

    (BSD 4-Clause University of California-Specific)
    @Ma27
    Ma27 committed May 4, 2021
    1
    Copy the full SHA
    9d06c92 View commit details

  4. nixUnstable: pre20210326_dd77f71 -> pre20210503_6d2553a 

    (amongst other things) several fixes to make the `ca-derivations`
experimental feature usable on a daily basis

(cherry picked from commit 2994db8)
    @thufschmitt @Ma27
    thufschmitt authored and Ma27 committed May 4, 2021
    Copy the full SHA
    2f9d534 View commit details

  5. hydraUnstable: 2021-03-29 -> 2021-04-29 

    Required to work with the latest nixUnstable

(cherry picked from commit bdc95ab)
    @thufschmitt @Ma27
    thufschmitt authored and Ma27 committed May 4, 2021
    Copy the full SHA
    f08c8dc View commit details

  6. perlPackages.CryptArgon2: init at 0.010 

    (cherry picked from commit ded288a)
    @cole-h @Ma27
    cole-h authored and Ma27 committed May 4, 2021
    Copy the full SHA
    bf30a5d View commit details

  7. perlPackages.CryptPassphrase: init at 0.003 

    (cherry picked from commit 05fb1b7)
    @cole-h @Ma27
    cole-h authored and Ma27 committed May 4, 2021
    Copy the full SHA
    354a565 View commit details

  8. perlPackages.CryptPassphraseArgon2: init at 0.002 

    (cherry picked from commit c610477)
    @cole-h @Ma27
    cole-h authored and Ma27 committed May 4, 2021
    Copy the full SHA
    fc722a1 View commit details

  9. perlPackages.StringCompareConstantTime: init at 0.321 

    (cherry picked from commit 1548f03)
    @cole-h @Ma27
    cole-h authored and Ma27 committed May 4, 2021
    Copy the full SHA
    c9dacc3 View commit details

  10. hydra-unstable: 2021-04-29 -> 2021-05-03 

    This incorporates a few more API fixes that have been made to Hydra since the
last bump.

(cherry picked from commit 451477e)
    @cole-h @Ma27
    cole-h authored and Ma27 committed May 4, 2021
    Copy the full SHA
    ab455d2 View commit details

  11. perlPackages*: use stdenv.lib rather than lib

    @Ma27
    Ma27 committed May 4, 2021
    Copy the full SHA
    3f10b5e View commit details

  12. keepassrpc: 1.8.0 -> 1.14.0 

    Fixes #96799 .

(cherry picked from commit 6a1a320)
    @tomberek
    Dirk Osburg authored and tomberek committed May 4, 2021
    Copy the full SHA
    d90df56 View commit details

Commits on May 5, 2021

  1. thunderbird-bin: 78.10.0 -> 78.10.1 

    (cherry picked from commit 361f0ff)
    @taku0
    taku0 committed May 5, 2021
    Copy the full SHA
    66d4b13 View commit details

  2. thunderbird: 78.10.0 -> 78.10.1 

    (cherry picked from commit 95e5066)
    @taku0
    taku0 committed May 5, 2021
    Copy the full SHA
    a4dc11e View commit details

  3. Merge pull request #121779 from taku0/thunderbird-bin-78.10.1_release… 

    …-20.09

[20.09] thunderbird, thunderbird-bin: 78.10.0 -> 78.10.1
    @lovesegfault
    lovesegfault authored May 5, 2021
    Copy the full SHA
    5c5e255 View commit details

  4. dysnomia: 0.10 -> 0.10.1 and add support for new plugins 

    (cherry picked from commit 1021cd5)
    @svanderburg
    svanderburg committed May 5, 2021
    Copy the full SHA
    aa6c243 View commit details

  5. disnix: 0.10 -> 0.10.1 and remove obsolete parameters 

    (cherry picked from commit 811e18a)
    @svanderburg
    svanderburg committed May 5, 2021
    Copy the full SHA
    ce14259 View commit details

  6. disnixos: 0.9 -> 0.9.1 

    (cherry picked from commit da6a769)
    @svanderburg
    svanderburg committed May 5, 2021
    Copy the full SHA
    07397c9 View commit details

  7. DisnixWebService: 0.10 -> 0.10.1 

    (cherry picked from commit 14971b1)
    @svanderburg
    svanderburg committed May 5, 2021
    Copy the full SHA
    870efa4 View commit details

  8. Merge pull request #121831 from svanderburg/disnix_update_stable 

    [20.09] Disnix update
    @svanderburg
    svanderburg authored May 5, 2021
    Copy the full SHA
    c830a2a View commit details

  9. Merge pull request #121739 from Ma27/2009-nixUnstable 

    [20.09] nixUnstable: 2.4pre20210326_dd77f71 -> 2.4pre20210503_6d2553a; hydra-unstable: 2021-03-29 -> 2021-05-03
    @Ma27
    Ma27 authored May 5, 2021
    Copy the full SHA
    eb7e1ef View commit details

Commits on May 6, 2021

  1. ffmpeg_2: mark as insecure 

    (cherry picked from commit 900fd5d)
    @dotlambda
    dotlambda committed May 6, 2021
    Copy the full SHA
    3a5bdee View commit details

  2. dysnomia: make function header more readable 

    (cherry picked from commit 52c427b)
    @svanderburg
    svanderburg committed May 6, 2021
    Copy the full SHA
    6bc5cfb View commit details

  3. nixos/disnix: configure the remote client by default, if multi-user m… 

    …ode has been enabled

(cherry picked from commit 77295e7)
    @svanderburg
    svanderburg committed May 6, 2021
    Copy the full SHA
    6fdbcf9 View commit details

  4. Merge pull request #121949 from svanderburg/disnix_style_fixes_stable 

    [20.09] Disnix style fixes
    @svanderburg
    svanderburg authored May 6, 2021
    Copy the full SHA
    2261248 View commit details

Commits on May 7, 2021

  1. masterpdfeditor: fix url (#122102)

    @dotlambda
    dotlambda authored May 7, 2021
    Copy the full SHA
    ead1fde View commit details

Commits on May 8, 2021

  1. Merge pull request #121908 from dotlambda/ffmpeg_2-insecure 

    [20.09] ffmpeg_2: mark as insecure
    @dotlambda
    dotlambda authored May 8, 2021
    Copy the full SHA
    3299d1b View commit details

  2. matrix-synapse: 1.32.2 -> 1.33.0 

    ChangeLog: https://github.com/matrix-org/synapse/releases/tag/v1.33.0
(cherry picked from commit cf7192d)
    @Ma27
    Ma27 committed May 8, 2021
    Copy the full SHA
    c03803a View commit details

  3. matrix-synapse: 1.33.0 -> 1.33.1 

    ChangeLog: https://github.com/matrix-org/synapse/releases/tag/v1.33.1
(cherry picked from commit c5e207c)
    @Ma27
    Ma27 committed May 8, 2021
    Copy the full SHA
    e459ad6 View commit details

  4. matrix-synapse: fix patch

    @Ma27
    Ma27 committed May 8, 2021
    Copy the full SHA
    1b688ca View commit details

Commits on May 10, 2021

  1. palemoon: Remove MOZ_PKG_SPECIAL, add AV1 configure flag 

    MOZ_PKG_SPECIAL: https://forum.palemoon.org/viewtopic.php?f=3&t=26796#p214729
"This is something we use for distinction for our infra. […] yeah just exclude it from your system packaging."

AV1: https://forum.palemoon.org/viewtopic.php?f=5&t=25843#p214767
"[It's] not on Linux and SunOS build instructions, only on Windows. But […] it is enabled for official Pale Moon"

(cherry picked from commit 0f4d390)
    @OPNA2608
    OPNA2608 committed May 10, 2021
    Copy the full SHA
    4fa43c5 View commit details

Commits on May 11, 2021

  1. Merge pull request #122421 from OPNA2608/fix/palemoon-config/20.09 

    [20.09] palemoon: Remove MOZ_PKG_SPECIAL, add AV1 configure flag
    @AndersonTorres
    AndersonTorres authored May 11, 2021
    Copy the full SHA
    8800791 View commit details

  2. gitea: 1.14.1 -> 1.14.2 

    ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.14.2
(cherry picked from commit f13efcf)
    @Ma27
    Ma27 committed May 11, 2021
    Copy the full SHA
    6e83cfb View commit details

  3. Merge branch 'release-20.09' into staging-20.09

    @vcunat
    vcunat committed May 11, 2021
    Copy the full SHA
    456ee57 View commit details
Showing with 485 additions and 414 deletions.
  1. +5 −0 lib/licenses.nix
  2. +1 −0 nixos/modules/services/misc/disnix.nix
  3. +2 −2 pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
  4. +1 −1 pkgs/applications/misc/masterpdfeditor/default.nix
  5. +2 −2 pkgs/applications/networking/browsers/palemoon/default.nix
  6. +265 −265 pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
  7. +2 −2 pkgs/applications/networking/mailreaders/thunderbird/default.nix
  8. +2 −2 pkgs/applications/version-management/gitea/default.nix
  9. +2 −2 pkgs/applications/version-management/redmine/Gemfile
  10. +41 −45 pkgs/applications/version-management/redmine/Gemfile.lock
  11. +2 −2 pkgs/applications/version-management/redmine/default.nix
  12. +26 −39 pkgs/applications/version-management/redmine/gemset.nix
  13. +3 −0 pkgs/development/libraries/ffmpeg/2.8.nix
  14. +2 −2 pkgs/development/libraries/ffmpeg/generic.nix
  15. +3 −0 pkgs/development/tools/misc/hydra/common.nix
  16. +3 −3 pkgs/development/tools/misc/hydra/default.nix
  17. +2 −2 pkgs/servers/mail/exim/default.nix
  18. +1 −1 pkgs/servers/matrix-synapse/0001-Drop-strict-version-constraint-for-cryptography.patch
  19. +2 −2 pkgs/servers/matrix-synapse/default.nix
  20. +5 −9 pkgs/tools/networking/tcpreplay/default.nix
  21. +3 −3 pkgs/tools/package-management/disnix/DisnixWebService/default.nix
  22. +6 −6 pkgs/tools/package-management/disnix/default.nix
  23. +3 −3 pkgs/tools/package-management/disnix/disnixos/default.nix
  24. +34 −18 pkgs/tools/package-management/disnix/dysnomia/default.nix
  25. +3 −3 pkgs/tools/package-management/nix/default.nix
  26. +64 −0 pkgs/top-level/perl-packages.nix
5 changes: 5 additions & 0 deletions lib/licenses.nix
View file
Original file line number Diff line number Diff line change
@@ -115,6 +115,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
fullName = ''BSD 4-clause "Original" or "Old" License'';
};

bsdOriginalUC = spdx {
spdxId = "BSD-4-Clause-UC";
fullName = "BSD 4-Clause University of California-Specific";
};

bsdProtection = spdx {
spdxId = "BSD-Protection";
fullName = "BSD Protection License";
1 change: 1 addition & 0 deletions nixos/modules/services/misc/disnix.nix
View file
Original file line number Diff line number Diff line change
@@ -53,6 +53,7 @@ in

environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService;
environment.variables.PATH = lib.optionals cfg.enableProfilePath (map (profileName: "/nix/var/nix/profiles/disnix/${profileName}/bin" ) cfg.profiles);
environment.variables.DISNIX_REMOTE_CLIENT = lib.optionalString (cfg.enableMultiUser) "disnix-client";

services.dbus.enable = true;
services.dbus.packages = [ pkgs.disnix ];
4 changes: 2 additions & 2 deletions pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, buildEnv, fetchurl, mono }:

let
version = "1.8.0";
version = "1.14.0";
drv = stdenv.mkDerivation {
pname = "keepassrpc";
inherit version;
src = fetchurl {
url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx";
sha256 = "1dclfpia559cqf78qw29zz235h1df5md4kgjv3bbi8y41wwmx7cd";
sha256 = "1c410cc93c0252e7cfdb02507b8172c13e18d12c97f08630b721d897dc9b8b24";
};

meta = with stdenv.lib; {
2 changes: 1 addition & 1 deletion pkgs/applications/misc/masterpdfeditor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "5.6.09";

src = fetchurl {
url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.amd64.tar.gz";
url = "https://code-industry.ru/public/master-pdf-editor-${version}-qt5.amd64.tar.gz";
sha256 = "0v9j6fwr0xl03kr77vf4wdb06zlplmn4mr3jyzxhvs8a77scmfzb";
};

4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/palemoon/default.nix
View file
Original file line number Diff line number Diff line change
@@ -142,6 +142,8 @@ stdenv.mkDerivation rec {
ac_add_options --enable-jemalloc
ac_add_options --enable-strip
ac_add_options --enable-devtools
# Missing from build instructions, https://forum.palemoon.org/viewtopic.php?f=5&t=25843#p214767
ac_add_options --enable-av1
ac_add_options --disable-eme
ac_add_options --disable-webrtc
@@ -159,8 +161,6 @@ stdenv.mkDerivation rec {
ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]}
export MOZ_PKG_SPECIAL=gtk$_GTK_VERSION
#
# NixOS-specific adjustments
#
Loading