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: 72d647f3d854
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3e4b15f0c4aa
Choose a head ref
22 contributors
Loading
Showing with 406 additions and 286 deletions.
  1. +0 −4 nixos/modules/tasks/filesystems/zfs.nix
  2. +4 −4 pkgs/applications/networking/browsers/firefox/packages.nix
  3. +3 −3 pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
  4. +233 −233 pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
  5. +2 −2 pkgs/applications/networking/mailreaders/thunderbird/default.nix
  6. +93 −0 pkgs/applications/networking/mullvad-vpn/default.nix
  7. +2 −2 pkgs/applications/networking/sieve-connect/default.nix
  8. +2 −2 pkgs/applications/office/libreoffice/default-primary-src.nix
  9. +2 −2 pkgs/applications/office/libreoffice/default.nix
  10. +12 −12 pkgs/applications/office/libreoffice/libreoffice-srcs.nix
  11. +23 −0 pkgs/development/haskell-modules/configuration-common.nix
  12. +2 −1 pkgs/development/libraries/gstreamer/base/default.nix
  13. +5 −2 pkgs/development/libraries/gstreamer/core/default.nix
  14. +2 −2 pkgs/development/libraries/gstreamer/default.nix
  15. +2 −1 pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
  16. +1 −1 pkgs/development/libraries/libvisual/default.nix
  17. +2 −2 pkgs/development/python-modules/buildbot/default.nix
  18. +2 −2 pkgs/development/python-modules/buildbot/pkg.nix
  19. +2 −2 pkgs/development/python-modules/buildbot/worker.nix
  20. +2 −2 pkgs/servers/plex/raw.nix
  21. +2 −2 pkgs/tools/admin/eksctl/default.nix
  22. +3 −3 pkgs/tools/backup/duplicati/default.nix
  23. +2 −2 pkgs/tools/misc/youtube-dl/default.nix
  24. +3 −0 pkgs/top-level/all-packages.nix
4 changes: 0 additions & 4 deletions nixos/modules/tasks/filesystems/zfs.nix
View file
Original file line number Diff line number Diff line change
@@ -314,10 +314,6 @@ in
assertion = !cfgZfs.forceImportAll || cfgZfs.forceImportRoot;
message = "If you enable boot.zfs.forceImportAll, you must also enable boot.zfs.forceImportRoot";
}
{
assertion = cfgZfs.requestEncryptionCredentials -> cfgZfs.enableUnstable;
message = "This feature is only available for zfs unstable. Set the NixOS option boot.zfs.enableUnstable.";
}
];

virtualisation.lxd.zfsSupport = true;
8 changes: 4 additions & 4 deletions pkgs/applications/networking/browsers/firefox/packages.nix
View file
Original file line number Diff line number Diff line change
@@ -246,15 +246,15 @@ in rec {

tor-browser-8-5 = tbcommon rec {
ffversion = "60.7.0esr";
tbversion = "8.5.0"; # TODO: update to match binary bundle (8.5.1 currently)
tbversion = "8.5.2";

# FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
src = fetchFromGitHub {
owner = "SLNOS";
repo = "tor-browser";
# branch "tor-browser-60.7.0esr-8.5-1-slnos"
rev = "8c69066856962116205c5c7508a0991dfb8ccd11";
sha256 = "1dshn7g9y6233vdqidrkg886ad6qjnl13vz2382ymbx180r2j73k";
# branch "tor-browser-60.7.0esr-8.5-2-slnos"
rev = "b8216328bf6bf1996fcd794d4531689a7c373a2f";
sha256 = "0zmqam3c91iww33jpfyl6q6wacj20nqkfzyqryalfvnvx3zi0i1q";
};

patches = [
6 changes: 3 additions & 3 deletions pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -89,7 +89,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];

# Upstream source
version = "8.5.1";
version = "8.5.3";

lang = "en-US";

@@ -99,15 +99,15 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
sha256 = "1mi587rh63ylhww0l8rr58qwbh9h7sk0c666mf84xk5b10s77hjb";
sha256 = "15ml0azc7imlfc2h88yxpxsyrf6pxxcd1si33bfbsjh17zw1282g";
};

"i686-linux" = fetchurl {
urls = [
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
sha256 = "160k5qdys6zy5cpsad2rm24ghfc2bd9b9gj3l0159di6hg21rk9k";
sha256 = "1zvcy44qx353qa5h90g0qigbp9xgaiq8s7a5wmhnfrfd2iw4ph7d";
};
};
in
Loading