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: b9330fe4ebb5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 67638a5bec85
Choose a head ref
Loading
Showing with 4,912 additions and 3,678 deletions.
  1. +0 −3 pkgs/applications/networking/browsers/chromium/README.md
  2. +1 −1 pkgs/applications/science/math/geogebra/default.nix
  3. +1 −1 pkgs/applications/version-management/git-and-tools/delta/default.nix
  4. +1 −1 pkgs/applications/window-managers/yabar/build.nix
  5. +4 −1 pkgs/development/arduino/arduino-core/default.nix
  6. +1 −0 pkgs/development/node-packages/node-packages.json
  7. +4,498 −3,615 pkgs/development/node-packages/node-packages.nix
  8. +37 −0 pkgs/development/python-modules/aiopulse/default.nix
  9. +34 −0 pkgs/development/python-modules/ambiclimate/default.nix
  10. +35 −0 pkgs/development/python-modules/blockchain/default.nix
  11. +2 −2 pkgs/development/python-modules/cloudflare/default.nix
  12. +42 −0 pkgs/development/python-modules/connect_box/default.nix
  13. +2 −2 pkgs/development/python-modules/hstspreload/default.nix
  14. +0 −26 pkgs/development/python-modules/htmltreediff/default.nix
  15. +3 −2 pkgs/development/python-modules/msgpack/default.nix
  16. +33 −0 pkgs/development/python-modules/netdata/default.nix
  17. +1 −1 pkgs/development/python-modules/pyaxmlparser/default.nix
  18. +2 −2 pkgs/development/python-modules/pyhomematic/default.nix
  19. +31 −0 pkgs/development/python-modules/pyi2cflash/default.nix
  20. +31 −0 pkgs/development/python-modules/pyspiflash/default.nix
  21. +45 −0 pkgs/development/python-modules/python-mystrom/default.nix
  22. +33 −0 pkgs/development/python-modules/schiene/default.nix
  23. +2 −2 pkgs/development/python-modules/toggl-cli/default.nix
  24. +33 −0 pkgs/development/python-modules/volkszaehler/default.nix
  25. +7 −4 pkgs/development/python-modules/xml2rfc/default.nix
  26. +1 −1 pkgs/development/python-modules/yowsup/default.nix
  27. +2 −2 pkgs/development/python-modules/zstandard/default.nix
  28. +8 −8 pkgs/servers/home-assistant/component-packages.nix
  29. +1 −1 pkgs/servers/mpd/default.nix
  30. +1 −1 pkgs/tools/admin/chkcrontab/default.nix
  31. +20 −2 pkgs/top-level/python-packages.nix
3 changes: 0 additions & 3 deletions pkgs/applications/networking/browsers/chromium/README.md
Original file line number Diff line number Diff line change
@@ -36,9 +36,6 @@ update `upstream-info.json`. After updates it is important to test at least
`nixosTests.chromium` (or basic manual testing) and `google-chrome` (which
reuses `upstream-info.json`).

After updating, please also update pkgs/development/tools/selenium/chromedriver/default.nix
to a matching version.

## Backports

All updates are considered security critical and should be ported to the stable
2 changes: 1 addition & 1 deletion pkgs/applications/science/math/geogebra/default.nix
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ let
calculus in one easy-to-use package.
'';
homepage = "https://www.geogebra.org/";
maintainers = with maintainers; [ ma27 ];
maintainers = with maintainers; [ ];
license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ];
platforms = with platforms; linux ++ darwin;
hydraPlatforms = [];
Original file line number Diff line number Diff line change
@@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec {
description = "A syntax-highlighting pager for git";
changelog = "https://github.com/dandavison/delta/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ marsam ma27 zowoq ];
maintainers = with maintainers; [ marsam zowoq ];
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/window-managers/yabar/build.nix
Original file line number Diff line number Diff line change
@@ -50,6 +50,6 @@ stdenv.mkDerivation {
homepage = "https://github.com/geommer/yabar";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ ma27 ];
maintainers = with maintainers; [ ];
};
}
5 changes: 4 additions & 1 deletion pkgs/development/arduino/arduino-core/default.nix
Original file line number Diff line number Diff line change
@@ -112,7 +112,10 @@ stdenv.mkDerivation rec {
};


nativeBuildInputs = [ wrapGAppsHook ];
# the glib setup hook will populate GSETTINGS_SCHEMAS_PATH,
# wrapGAppHooks (among other things) adds it to XDG_DATA_DIRS
# so 'save as...' works:
nativeBuildInputs = [ glib wrapGAppsHook ];
buildInputs = [
jdk
ant
1 change: 1 addition & 0 deletions pkgs/development/node-packages/node-packages.json
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@
, "browserify"
, "btc-rpc-explorer"
, "castnow"
, "cdktf-cli"
, "clean-css-cli"
, "clubhouse-cli"
, "coc-css"
Loading