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: 77916109eddc
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: 4b201f6c5797
Choose a head ref
  • 6 commits
  • 3 files changed
  • 5 contributors

Commits on Apr 14, 2019

  1. nixos: fix system-tarball

    @furrycatherder
    furrycatherder committed Apr 14, 2019
    Copy the full SHA
    040d159 View commit details

Commits on Apr 19, 2019

  1. nixos/matrix-synapse: correct trusted_third_party_id_servers default 

    the servers are equivalent and synchronized, but Riot defaults to use vector.im
Source: https://github.com/matrix-org/synapse/blob/v0.99.3/docs/sample_config.yaml#L701
    @florianjacob
    florianjacob committed Apr 19, 2019
    Copy the full SHA
    34aa25b View commit details

Commits on Apr 21, 2019

  1. Merge pull request #59880 from florianjacob/matrix-synapse-identity-s… 

    …ervers

nixos/matrix-synapse: correct trusted_third_party_id_servers default
    @Ekleog
    Ekleog authored Apr 21, 2019
    Copy the full SHA
    451961e View commit details

  2. Merge pull request #59435 from furrycatherder/fix-tarball 

    nixos: fix system-tarball
    @matthewbauer
    matthewbauer authored Apr 21, 2019
    Copy the full SHA
    2a8ca24 View commit details

  3. nixos/virtualbox: Fixes configuration to evaluate 

    Fixes issue introduced by #57557
    @samueldr
    samueldr committed Apr 21, 2019
    Copy the full SHA
    429e554 View commit details

  4. Merge pull request #59945 from samueldr/fix/ova-eval-failure 

    nixos/virtualbox: Fixes configuration to evaluate
    @samueldr
    samueldr authored Apr 21, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    xorilog Christophe Boucharlat
    GPG key ID: CE2B4A66072BEB05
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4b201f6 View commit details
2 changes: 1 addition & 1 deletion nixos/modules/installer/cd-dvd/system-tarball.nix
View file
Original file line number Diff line number Diff line change
@@ -68,7 +68,7 @@ in

# Create the tarball
system.build.tarball = import ../../../lib/make-system-tarball.nix {
inherit (pkgs) stdenv perl xz pathsFromGraph;
inherit (pkgs) stdenv closureInfo pixz;

inherit (config.tarball) contents storeContents;
};
5 changes: 4 additions & 1 deletion nixos/modules/services/misc/matrix-synapse.nix
View file
Original file line number Diff line number Diff line change
@@ -554,7 +554,10 @@ in {
};
trusted_third_party_id_servers = mkOption {
type = types.listOf types.str;
default = ["matrix.org"];
default = [
"matrix.org"
"vector.im"
];
description = ''
The list of identity servers trusted to verify third party identifiers by this server.
'';
4 changes: 2 additions & 2 deletions nixos/modules/virtualisation/virtualbox-image.nix
View file
Original file line number Diff line number Diff line change
@@ -100,10 +100,10 @@ in {
boot.growPartition = true;
boot.loader.grub.device = "/dev/sda";

swap.swapDevices = {
swapDevices = [{
device = "/var/swap";
size = 2048;
};
}];

virtualisation.virtualbox.guest.enable = true;