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: 3deaa4b1b12e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3a8a85da2294
Choose a head ref
Loading
Showing with 1,068 additions and 468 deletions.
  1. +1 −1 pkgs/applications/editors/vscode/vscode.nix
  2. +19 −15 pkgs/applications/misc/mupdf/default.nix
  3. +4 −4 pkgs/applications/networking/browsers/firefox/packages.nix
  4. +3 −6 pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
  5. +2 −2 pkgs/applications/networking/gns3/server.nix
  6. +2 −2 pkgs/applications/networking/instant-messengers/discord/default.nix
  7. +265 −265 pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
  8. +2 −2 pkgs/applications/networking/mailreaders/thunderbird/default.nix
  9. +24 −14 pkgs/applications/version-management/gitea/default.nix
  10. +2 −1 pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
  11. +2 −1 pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
  12. +4 −4 pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
  13. +4 −4 pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
  14. +4 −4 pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix
  15. +4 −4 pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix
  16. +4 −4 pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix
  17. +4 −4 pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
  18. +76 −76 pkgs/development/compilers/adoptopenjdk-bin/sources.json
  19. +4 −1 pkgs/development/interpreters/guile/1.8.nix
  20. +59 −0 pkgs/development/interpreters/guile/CVE-2016-8605.patch
  21. +2 −2 pkgs/development/libraries/nss/latest.nix
  22. +2 −2 pkgs/development/libraries/openssl/default.nix
  23. +2 −2 pkgs/development/libraries/webkitgtk/default.nix
  24. +475 −0 pkgs/development/python-modules/aiohttp/CVE-2021-21330.patch
  25. +7 −2 pkgs/development/python-modules/aiohttp/default.nix
  26. +2 −2 pkgs/os-specific/linux/kernel/hardened/config.nix
  27. +18 −12 pkgs/os-specific/linux/kernel/hardened/patches.json
  28. +2 −2 pkgs/os-specific/linux/kernel/linux-4.14.nix
  29. +2 −2 pkgs/os-specific/linux/kernel/linux-4.19.nix
  30. +2 −2 pkgs/os-specific/linux/kernel/linux-4.4.nix
  31. +2 −2 pkgs/os-specific/linux/kernel/linux-4.9.nix
  32. +2 −2 pkgs/os-specific/linux/kernel/linux-5.10.nix
  33. +18 −0 pkgs/os-specific/linux/kernel/linux-5.11.nix
  34. +2 −2 pkgs/os-specific/linux/kernel/linux-5.4.nix
  35. +8 −6 pkgs/os-specific/linux/zfs/default.nix
  36. +2 −2 pkgs/servers/bird/default.nix
  37. +2 −2 pkgs/servers/matrix-synapse/default.nix
  38. +9 −1 pkgs/servers/traefik/default.nix
  39. +2 −2 pkgs/servers/web-apps/wordpress/default.nix
  40. +2 −2 pkgs/tools/admin/salt/default.nix
  41. +2 −2 pkgs/tools/misc/youtube-dl/default.nix
  42. +1 −0 pkgs/tools/security/steghide/default.nix
  43. +10 −2 pkgs/top-level/all-packages.nix
  44. +3 −1 pkgs/top-level/metrics.nix
2 changes: 1 addition & 1 deletion pkgs/applications/editors/vscode/vscode.nix
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ in

src = fetchurl {
name = "VSCode_${version}_${plat}.${archive_fmt}";
url = "https://vscode-update.azurewebsites.net/${version}/${plat}/stable";
url = "https://update.code.visualstudio.com/${version}/${plat}/stable";
inherit sha256;
};

34 changes: 19 additions & 15 deletions pkgs/applications/misc/mupdf/default.nix
Original file line number Diff line number Diff line change
@@ -22,24 +22,28 @@ in stdenv.mkDerivation rec {
sha256 = "0rljl44y8p8hgaqializlyrgpij1wbnrzyp0ll5kcg7w05nylq48";
};

patches =
stdenv.lib.optional stdenv.isDarwin ./darwin.patch ++ [
patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch ++ [
(fetchpatch {
name = "pdfocr.patch";
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a507b139adf37d2c742e039815601cdc2aa00a84";
sha256 = "1fx6pdgwrbk3bqsx53764d61llfj9s5q8lxqkna7mjnp7mg4krj3";
})
name = "pdfocr.patch";
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a507b139adf37d2c742e039815601cdc2aa00a84";
sha256 = "1fx6pdgwrbk3bqsx53764d61llfj9s5q8lxqkna7mjnp7mg4krj3";
})
(fetchpatch {
name = "pdf-layer.patch";
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54";
sha256 = "0ma8jq8d9a0mf26qjklgi4gdaflpjik1br1nhafzvjz7ccl56ksm";
})
name = "pdf-layer.patch";
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54";
sha256 = "0ma8jq8d9a0mf26qjklgi4gdaflpjik1br1nhafzvjz7ccl56ksm";
})
(fetchpatch {
name = "pixmap.patch";
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=32e4e8b4bcbacbf92af7c88337efae21986d9603";
sha256 = "1zqkxgwrhcwsdya98pcmpq2815jjmv3fwsp0sba9f5nq5xi6whbj";
})
];
name = "pixmap.patch";
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=32e4e8b4bcbacbf92af7c88337efae21986d9603";
sha256 = "1zqkxgwrhcwsdya98pcmpq2815jjmv3fwsp0sba9f5nq5xi6whbj";
})
(fetchpatch {
name = "CVE-2021-3407.patch";
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=cee7cefc610d42fd383b3c80c12cbc675443176a";
sha256 = "18g9jsj90jnqibaff8pqi70a7x8ygc3sh4jl4xnvlv8vr7fxxbh6";
})
];

postPatch = ''
sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c
8 changes: 4 additions & 4 deletions pkgs/applications/networking/browsers/firefox/packages.nix
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@ in
rec {
firefox = commonCP rec {
pname = "firefox";
ffversion = "86.0.1";
ffversion = "87.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "e613cdcadfd71a01800a72c08c590032605ca8a8a0ba93326ffba93c2819f629fd620c23d00ca1274b203adc20acfe5d7913fee240ff14819fb1377ed08b1214";
sha512 = "c1c08be2283e7a162c8be2f2647ec2bb85cab592738dc45e4b4ffb72969229cc0019a30782a4cb27f09a13b088c63841071dd202b3543dfba295140a7d6246a4";
};

meta = {
@@ -33,10 +33,10 @@ rec {

firefox-esr-78 = commonCP rec {
pname = "firefox-esr";
ffversion = "78.8.0esr";
ffversion = "78.9.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "0160aa6c408c2af66d24b74cf98e1a07ab1604e7b93ffcde79201f9d68e41e896ef965f1904de52d5dd82ffedae33ac96e93b871727bf5dd5983c5af2f1f439f";
sha512 = "28582fc0a03fb50c0a817deb1083817bb7f2f5d38e98439bf655ed4ee18c83568b3002a59ef76edf357bfb11f55832a221d14130f116aac19d850768fba3ac8b";
};

meta = {
Original file line number Diff line number Diff line change
@@ -33,9 +33,6 @@

, gmp

# Pluggable transport dependencies
, python27

# Wrapper runtime
, coreutils
, glibcLocales
@@ -91,19 +88,19 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];

# Upstream source
version = "10.0.12";
version = "10.0.15";

lang = "en-US";

srcs = {
x86_64-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
sha256 = "0i5g997kgn7n6ji7pxbyvkx33nqfi2s1val680fp5hh1zz31yvfv";
sha256 = "1ah69jmfgik063f9gkvyv9d4k706pqihmzc4k7cc95zyd17v8wrs";
};

i686-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
sha256 = "16915fvvq3d16v1bzclnb52sa6yyaalihk3gv93jcnph9vsz8ags";
sha256 = "0gyhxfs4qpg6ys038d52cxnmb4khbng1w4hcsavi2rlgv18bz75p";
};
};
in
4 changes: 2 additions & 2 deletions pkgs/applications/networking/gns3/server.nix
Original file line number Diff line number Diff line change
@@ -34,8 +34,8 @@ in python.pkgs.buildPythonPackage {
};

postPatch = ''
# yarl 1.4+ only requires Python 3.6+
sed -iE "s/yarl==1.3.0//" requirements.txt
substituteInPlace requirements.txt --replace \
"aiohttp==3.6.2" "aiohttp>=3.6.2"
'';

propagatedBuildInputs = with python.pkgs; [
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@ in {
pname = "discord";
binaryName = "Discord";
desktopName = "Discord";
version = "0.0.13";
version = "0.0.14";
src = fetchurl {
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
sha256 = "0d5z6cbj9dg3hjw84pyg75f8dwdvi2mqxb9ic8dfqzk064ssiv7y";
sha256 = "1rq490fdl5pinhxk8lkfcfmfq7apj79jzf3m14yql1rc9gpilrf2";
};
};
ptb = callPackage ./base.nix rec {
Loading