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: 2ec5e9595bec
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: 7defc47944fe
Choose a head ref
Loading
Showing with 955 additions and 909 deletions.
  1. +11 −1 nixos/modules/system/boot/kexec.nix
  2. +2 −2 pkgs/applications/audio/flacon/default.nix
  3. +397 −397 pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
  4. +397 −397 pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
  5. +4 −4 pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
  6. +2 −2 pkgs/applications/office/libreoffice/default-primary-src.nix
  7. +2 −2 pkgs/applications/office/libreoffice/default.nix
  8. +8 −8 pkgs/applications/office/libreoffice/libreoffice-srcs.nix
  9. +2 −1 pkgs/applications/video/mpv/default.nix
  10. +4 −1 pkgs/applications/window-managers/awesome/default.nix
  11. +6 −6 pkgs/applications/window-managers/i3/status-rust.nix
  12. +2 −2 pkgs/development/libraries/audio/libbass/default.nix
  13. +5 −1 pkgs/development/libraries/libseccomp/default.nix
  14. +5 −3 pkgs/development/python-modules/fonttools/default.nix
  15. +14 −8 pkgs/development/python-modules/imread/default.nix
  16. +2 −2 pkgs/development/tools/analysis/flow/default.nix
  17. +6 −0 pkgs/development/tools/analysis/valgrind/default.nix
  18. +9 −1 pkgs/development/tools/misc/binutils/default.nix
  19. +14 −3 pkgs/development/tools/pipenv/default.nix
  20. +19 −0 pkgs/development/tools/rust/cargo-bloat/cargo-lock.patch
  21. +4 −3 pkgs/development/tools/rust/cargo-bloat/default.nix
  22. +4 −1 pkgs/os-specific/linux/kexectools/default.nix
  23. +2 −2 pkgs/servers/nosql/influxdb/default.nix
  24. +12 −48 pkgs/servers/nosql/influxdb/deps.nix
  25. +2 −2 pkgs/servers/radarr/default.nix
  26. +2 −2 pkgs/tools/backup/bacula/default.nix
  27. +8 −3 pkgs/tools/misc/ultrastar-creator/default.nix
  28. +3 −3 pkgs/tools/misc/ultrastar-manager/default.nix
  29. +2 −2 pkgs/tools/package-management/nix-review/default.nix
  30. +1 −1 pkgs/top-level/all-packages.nix
  31. +3 −1 pkgs/top-level/python-packages.nix
  32. +1 −0 pkgs/top-level/release-cross.nix
12 changes: 11 additions & 1 deletion nixos/modules/system/boot/kexec.nix
Original file line number Diff line number Diff line change
@@ -13,8 +13,18 @@
path = [ pkgs.kexectools ];
script =
''
# Don't load the current system profile if we already have a kernel loaded
if [[ 1 = "$(</sys/kernel/kexec_loaded)" ]] ; then
echo "kexec kernel has already been loaded, prepare-kexec skipped"
exit 0
fi
p=$(readlink -f /nix/var/nix/profiles/system)
if ! [ -d $p ]; then exit 1; fi
if ! [[ -d $p ]]; then
echo "Could not find system profile for prepare-kexec"
exit 1
fi
echo "Loading NixOS system via kexec."
exec kexec --load $p/kernel --initrd=$p/initrd --append="$(cat $p/kernel-params) init=$p/init"
'';
};
4 changes: 2 additions & 2 deletions pkgs/applications/audio/flacon/default.nix
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@

stdenv.mkDerivation rec {
name = "flacon-${version}";
version = "5.2.0";
version = "5.4.0";

src = fetchFromGitHub {
owner = "flacon";
repo = "flacon";
rev = "v${version}";
sha256 = "0vmbwpfjq66qv3zp7mss3hsxy6dxjybqfm7k2xyc0w181qclg1ya";
sha256 = "1j8gzk92kn10yb7rmvrnyq0ipda2swnkmsavqsk5ws0z600p3k93";
};

nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
Loading