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: 0f5ce2fac0c7
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: d7f71a397549
Choose a head ref
9 contributors
Loading
Showing with 961 additions and 839 deletions.
  1. +1 −1 nixos/modules/services/x11/display-managers/default.nix
  2. +26 −4 nixos/tests/podman.nix
  3. +3 −3 pkgs/applications/misc/hugo/default.nix
  4. +385 −385 pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
  5. +385 −385 pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
  6. +3 −1 pkgs/applications/networking/cluster/cni/plugins.nix
  7. +3 −3 pkgs/applications/networking/cluster/helm/default.nix
  8. +3 −0 pkgs/applications/virtualization/conmon/default.nix
  9. +3 −0 pkgs/applications/virtualization/crun/default.nix
  10. +1 −1 pkgs/applications/virtualization/podman/default.nix
  11. +3 −0 pkgs/applications/virtualization/runc/default.nix
  12. +1 −1 pkgs/build-support/docker/default.nix
  13. +4 −3 pkgs/build-support/docker/nix-prefetch-docker
  14. +28 −0 pkgs/data/documentation/scheme-manpages/default.nix
  15. +6 −5 pkgs/development/libraries/grpc/default.nix
  16. +34 −0 pkgs/development/python-modules/bleak/default.nix
  17. +4 −4 pkgs/development/python-modules/discordpy/default.nix
  18. +2 −2 pkgs/development/python-modules/grpcio-tools/default.nix
  19. +22 −0 pkgs/development/python-modules/txdbus/default.nix
  20. +3 −3 pkgs/development/tools/cloudflare-wrangler/default.nix
  21. +2 −2 pkgs/development/tools/misc/circleci-cli/default.nix
  22. +2 −2 pkgs/development/tools/misc/clojure-lsp/default.nix
  23. +12 −20 pkgs/development/tools/skopeo/default.nix
  24. +2 −2 pkgs/servers/sql/postgresql/ext/timescaledb.nix
  25. +2 −2 pkgs/tools/admin/clair/default.nix
  26. +3 −1 pkgs/tools/filesystems/fuse-overlayfs/default.nix
  27. +3 −3 pkgs/tools/misc/ffsend/default.nix
  28. +2 −2 pkgs/tools/networking/amass/default.nix
  29. +2 −2 pkgs/tools/networking/mu/default.nix
  30. +3 −0 pkgs/tools/networking/slirp4netns/default.nix
  31. +2 −2 pkgs/tools/security/bettercap/default.nix
  32. +2 −0 pkgs/top-level/all-packages.nix
  33. +4 −0 pkgs/top-level/python-packages.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/display-managers/default.nix
View file
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ let
${optionalString cfg.startDbusSession ''
if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
exec ${pkgs.dbus.dbus-launch} --exit-with-session "$0" "$@"
${config.systemd.package}/bin/systemctl --user start dbus.socket
fi
''}
30 changes: 26 additions & 4 deletions nixos/tests/podman.nix
View file
Original file line number Diff line number Diff line change
@@ -38,23 +38,45 @@ import ./make-test-python.nix (
start_all()
with subtest("Run container as root"):
with subtest("Run container as root with runc"):
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
podman.succeed(
"podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
"podman run --runtime=runc -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
)
podman.succeed("podman ps | grep sleeping")
podman.succeed("podman stop sleeping")
podman.succeed("podman rm sleeping")
with subtest("Run container rootless"):
with subtest("Run container as root with crun"):
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
podman.succeed(
"podman run --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
)
podman.succeed("podman ps | grep sleeping")
podman.succeed("podman stop sleeping")
podman.succeed("podman rm sleeping")
with subtest("Run container rootless with runc"):
podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
podman.succeed(
su_cmd(
"podman run --runtime=runc -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
)
)
podman.succeed(su_cmd("podman ps | grep sleeping"))
podman.succeed(su_cmd("podman stop sleeping"))
podman.succeed(su_cmd("podman rm sleeping"))
with subtest("Run container rootless with crun"):
podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
podman.succeed(
su_cmd(
"podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
"podman run --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
)
)
podman.succeed(su_cmd("podman ps | grep sleeping"))
podman.succeed(su_cmd("podman stop sleeping"))
podman.succeed(su_cmd("podman rm sleeping"))
'';
}
)
6 changes: 3 additions & 3 deletions pkgs/applications/misc/hugo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

buildGoModule rec {
pname = "hugo";
version = "0.70.0";
version = "0.71.0";

buildInputs = [ libsass ];

src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
sha256 = "14g1x95jh91z9xm3xkv2psw2jn7z6bv2009miyv727df4d58nh6m";
sha256 = "1cjf69y8wvjq7kpncvqzmhc03pmf21nfxqpdnh64v34d14gpa1aa";
};

golibsass = fetchFromGitHub {
@@ -27,7 +27,7 @@ buildGoModule rec {
'';
});

vendorSha256 = "1wl9pg5wf1n5n7gq6lyz0l5ij4icjpfinl4myxwj93l2hqqyx2lf";
vendorSha256 = "1fz1wvw0jy3rj6pl1w6vpr0xr1v8pnpf76bwdalacqy6r85lxmkl";

buildFlags = [ "-tags" "extended" ];

Loading