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: ddebab3575e8
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: 645534639562
Choose a head ref
Loading
Showing with 660 additions and 540 deletions.
  1. +1 −1 nixos/modules/security/rngd.nix
  2. +5 −7 pkgs/applications/editors/kile/default.nix
  3. +2 −2 pkgs/applications/misc/urh/default.nix
  4. +18 −26 pkgs/applications/networking/browsers/chromium/common.nix
  5. +0 −15 pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch
  6. +0 −9 pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch
  7. +9 −9 pkgs/applications/networking/browsers/chromium/upstream-info.nix
  8. +397 −397 pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
  9. +4 −1 pkgs/applications/networking/browsers/firefox/common.nix
  10. +2 −2 pkgs/applications/networking/browsers/firefox/packages.nix
  11. +1 −1 pkgs/development/compilers/ghc/8.6.1.nix
  12. +30 −0 pkgs/development/libraries/jitterentropy/default.nix
  13. +4 −4 pkgs/development/libraries/nss/default.nix
  14. +63 −0 pkgs/development/libraries/science/math/or-tools/default.nix
  15. +12 −0 pkgs/development/libraries/science/math/or-tools/gflags-include.patch
  16. +4 −4 pkgs/development/ocaml-modules/vg/default.nix
  17. +2 −2 pkgs/development/python-modules/astropy/default.nix
  18. +2 −2 pkgs/development/python-modules/augeas/default.nix
  19. +2 −2 pkgs/development/python-modules/bjoern/default.nix
  20. +2 −2 pkgs/development/python-modules/celery/default.nix
  21. +2 −2 pkgs/development/python-modules/django-hijack/default.nix
  22. +2 −2 pkgs/development/python-modules/django_environ/default.nix
  23. +2 −2 pkgs/development/python-modules/flask-oauthlib/default.nix
  24. +2 −2 pkgs/development/python-modules/gnureadline/default.nix
  25. +2 −2 pkgs/development/python-modules/gsd/default.nix
  26. +2 −2 pkgs/development/python-modules/ibmquantumexperience/default.nix
  27. +2 −2 pkgs/development/python-modules/mypy/default.nix
  28. +2 −2 pkgs/development/tools/ocaml/ocamlbuild/default.nix
  29. +38 −23 pkgs/servers/mqtt/mosquitto/default.nix
  30. +2 −2 pkgs/shells/zsh/antibody/default.nix
  31. +38 −12 pkgs/tools/security/rng-tools/default.nix
  32. +1 −0 pkgs/top-level/aliases.nix
  33. +5 −1 pkgs/top-level/all-packages.nix
2 changes: 1 addition & 1 deletion nixos/modules/security/rngd.nix
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ with lib;

description = "Hardware RNG Entropy Gatherer Daemon";

serviceConfig.ExecStart = "${pkgs.rng_tools}/sbin/rngd -f -v" +
serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f -v" +
(if config.services.tcsd.enable then " --no-tpm=1" else "");
};
};
12 changes: 5 additions & 7 deletions pkgs/applications/editors/kile/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ mkDerivation
, lib
, fetchgit
, fetchurl
, extra-cmake-modules
, kdoctools
, wrapGAppsHook
@@ -22,13 +22,11 @@
}:

mkDerivation rec {
name = "kile-${version}";
version = "2017-02-09";
name = "kile-2.9.92";

src = fetchgit {
url = git://anongit.kde.org/kile.git;
rev = "f77f6e627487c152f111e307ad6dc71699ade746";
sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib";
src = fetchurl {
url = "mirror://sourceforge/kile/${name}.tar.bz2";
sha256 = "177372dc25b1d109e037a7dbfc64b5dab2efe538320c87f4a8ceada21e9097f2";

};

4 changes: 2 additions & 2 deletions pkgs/applications/misc/urh/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

python3Packages.buildPythonApplication rec {
name = "urh-${version}";
version = "2.3.0";
version = "2.4.0";

src = fetchFromGitHub {
owner = "jopohl";
repo = "urh";
rev = "v${version}";
sha256 = "1n105lwz8w5fiw93w9amasq0f4gknihl3x9kj0q77lw7ha1lvdfz";
sha256 = "0cwbqcv0yffg6fa3g4zknwffa6119i6827w6jm74fhlfa9kwy34c";
};

buildInputs = [ hackrf rtl-sdr ];
44 changes: 18 additions & 26 deletions pkgs/applications/networking/browsers/chromium/common.nix
Original file line number Diff line number Diff line change
@@ -92,11 +92,6 @@ let
buildPath = "out/${buildType}";
libExecPath = "$out/libexec/${packageName}";

freetype_source = fetchurl {
url = http://anduin.linuxfromscratch.org/BLFS/other/chromium-freetype.tar.xz;
sha256 = "1vhslc4xg0d6wzlsi99zpah2xzjziglccrxn55k7qna634wyxg77";
};

versionRange = min-version: upto-version:
let inherit (upstream-info) version;
result = versionAtLeast version min-version && versionOlder version upto-version;
@@ -132,22 +127,26 @@ let
++ optional pulseSupport libpulseaudio
++ optional (versionAtLeast version "71") at-spi2-core;

patches = [
# As major versions are added, you can trawl the gentoo and arch repos at
# https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/
# https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium
# for updated patches and hints about build flags
# (gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
./patches/fix-freetype.patch
patches = optional enableWideVine ./patches/widevine.patch ++ [
./patches/nix_plugin_paths_68.patch
./patches/remove-webp-include-69.patch
] ++ optional enableWideVine ./patches/widevine.patch
++ optional ((versionRange "69" "70") && stdenv.isAarch64)
(fetchpatch {
url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/0001-vpx_sum_squares_2d_i16_neon-Make-s2-a-uint64x1_t.patch;
sha256 = "0f37rsjx7jcvdngkj8y6600091nwgn4jci0ny7bxlapq0zx2a4x7";
})
++ optional stdenv.isAarch64
# Unfortunately, chromium regularly breaks on major updates and
# then needs various patches backported. Good sources for such patches and other hints:
# - https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/
# - https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium
# - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits
#
# ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )
] ++ optionals (versionOlder version "71") [
( githubPatch "cbdb8bd6567c8143dc8c1e5e86a21a8ea064eea4" "0258qlffp6f6izswczb11p8zdpn550z5yqa9z7gdg2rg5171n5i8" )
( githubPatch "e98f8ef8b2f236ecbb01df8c39e6ee1c8fbe8d7d" "1ky5xrzch6aya87kn0bgb31lksl3g8kh2v8k676ks7pdl2v132p9" )
( githubPatch "a4de8da116585357c123d71e5f54d1103824c6df" "1y7afnjrsz6j2l3vy1ms8mrkbb51xhcafw9r371algi48il7rajm" )
( githubPatch "b033d2ba32da5ea237656568c25908d4f12b7bac" "008dg8vk822wyrinirx4nh92yq9bki4mwfwvcwnxdjmvz3y0jfcc" )
( githubPatch "2f9563e49f6c28dfe52940901417a4031b95a49b" "1q8qhpzx611yzrxa8lgpw0bad9bxx84rsrvczl4xvk5qh93zna7i" )
( githubPatch "a66e0a3f3f57eb045639e2752a99ade348dc17e9" "1c5x9856b167z270357wr8l6m1wrznxcx89ykj6kfz5djqmv251g" )
( githubPatch "4d9714247f617bf9e1cf95f735148f5e598a9529" "1423jf3lzbljzgbcwvfrrfyhyl3fab988hsyjvk95zyclxff7iij" )
( githubPatch "87902b3202f81d689dd314c17006ffc907fe12a1" "15q37cd26s73girq1imcs52fb1irh0qlfvhksh6g0l0jjrdyzk6r" )
] ++ optional stdenv.isAarch64
(if (versionOlder version "71") then
fetchpatch {
url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch;
@@ -193,11 +192,6 @@ let
mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s $(which node) third_party/node/linux/node-linux-x64/bin/node
# use patched freetype
# FIXME https://bugs.chromium.org/p/pdfium/issues/detail?id=733
# FIXME http://savannah.nongnu.org/bugs/?51156
tar -xJf ${freetype_source}
# remove unused third-party
# in third_party/crashpad third_party/zlib contains just a header-adapter
for lib in ${toString gnSystemLibraries}; do
@@ -243,8 +237,6 @@ let
google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI";
google_default_client_id = "404761575300.apps.googleusercontent.com";
google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D";
} // optionalAttrs (versionRange "60" "70") {
use_gtk3 = true;
} // optionalAttrs proprietaryCodecs {
# enable support for the H.264 codec
proprietary_codecs = true;

This file was deleted.

Original file line number Diff line number Diff line change
@@ -50,15 +50,6 @@ index f4e119d..d9775bd 100644
return false;
cur = cur.Append(kPepperFlashBaseDirectory);
break;
@@ -323,7 +316,7 @@ bool PathProvider(int key, base::FilePath* result) {
// We currently need a path here to look up whether the plugin is disabled
// and what its permissions are.
case chrome::FILE_NACL_PLUGIN:
- if (!GetInternalPluginsDirectory(&cur))
+ if (!GetInternalPluginsDirectory(&cur, "NACL"))
return false;
cur = cur.Append(kInternalNaClPluginFileName);
break;
@@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) {
cur = cur.DirName();
}
18 changes: 9 additions & 9 deletions pkgs/applications/networking/browsers/chromium/upstream-info.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
sha256 = "16biicw86mnjrmjazfbml2pf4rykhbvsz854cyfnpjhcvmlh24jp";
sha256bin64 = "07jr1sqsxfdy3rymylkbpbgi79j9b2pax4igdzj943d0nbka84y5";
version = "70.0.3538.35";
sha256 = "0dqfwghl73gcmbnl9wb3i5wz8q65y1vhg7n0m2nh0hv33w1w4mp9";
sha256bin64 = "0x7npns1ng7p4w1qswcj889v9lplvy2wv1ccxrk4ilyqiwzvwy1z";
version = "70.0.3538.67";
};
dev = {
sha256 = "0fmkhvvydinv5f543n7rrmsv99rf0skwwhlpmszvspx6y4wz9smv";
sha256bin64 = "0plr8ph78kfg2dpyacjy3aw3msfif95fqpb8xx0n8whkkpbl9968";
version = "71.0.3559.6";
sha256 = "1kw0rn58s4nd43z2qkjph7aid0s3jnmm650d7k1yxppgmfsal246";
sha256bin64 = "0518qrghjk5jlzhmynk6nngp5i81bpxi3880gimpbd7bblj6dg7y";
version = "71.0.3578.10";
};
stable = {
sha256 = "0dcyzsb70ssx5hd2b25ab3ydpqh7crhxab9zzi5gn99ywxh1afg3";
sha256bin64 = "0w56k7hmdi9knjaw67kdmyz0fdkjmk2ldh2n4l1c6szkr66vq30q";
version = "69.0.3497.100";
sha256 = "0dqfwghl73gcmbnl9wb3i5wz8q65y1vhg7n0m2nh0hv33w1w4mp9";
sha256bin64 = "0ihs2xfb2zn8aq11kg7miw9rnjwc6l4k5jgf24dm661463xmd3ha";
version = "70.0.3538.67";
};
}
Loading