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: ce0a54092da2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b4c2e6b6c500
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 12, 2019

  1. graphene-hardened-malloc: constrain platforms to x64 linux 

    Build error on i686:

> util.h:39:18: error: '__int128' is not supported on this target
  typedef unsigned __int128 u128;

(cherry picked from commit a08851c)
    @joachifm
    joachifm committed Oct 12, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    ejose19
    GPG key ID: 09BEDF7CC137762C
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4584459 View commit details

  2. nixos/containers: explicitly load kernel modules for networking 

    List all modules that *may* be required depending on individual container
configurations; don't expect that further modules can be loaded after boot.

Fixes #38676

(cherry picked from commit fe3da83)
    @joachifm
    joachifm committed Oct 12, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    ejose19
    GPG key ID: 09BEDF7CC137762C
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b4c2e6b View commit details
Showing with 8 additions and 1 deletion.
  1. +7 −0 nixos/modules/virtualisation/containers.nix
  2. +1 −1 pkgs/development/libraries/graphene-hardened-malloc/default.nix
7 changes: 7 additions & 0 deletions nixos/modules/virtualisation/containers.nix
View file
Original file line number Diff line number Diff line change
@@ -824,5 +824,12 @@ in
'';

environment.systemPackages = [ pkgs.nixos-container ];

boot.kernelModules = [
"bridge"
"macvlan"
"tap"
"tun"
];
});
}
2 changes: 1 addition & 1 deletion pkgs/development/libraries/graphene-hardened-malloc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.mit;
maintainers = with maintainers; [ ris ];
platforms = platforms.linux;
platforms = [ "x86_64-linux" ];
};
}