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/infra
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8516ff0a606a
Choose a base ref
...
head repository: NixOS/infra
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8c8761225378
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 30, 2020

  1. Copy the full SHA
    8c87612 View commit details
Showing with 0 additions and 15 deletions.
  1. +0 −13 channels.nix
  2. +0 −2 nixos-org/webserver.nix
13 changes: 0 additions & 13 deletions channels.nix
Original file line number Diff line number Diff line change
@@ -42,19 +42,6 @@ rec {
job = "nixpkgs/nixpkgs-19.03-darwin/darwin-tested";
current = false;
};

"nixos-18.09" = {
job = "nixos/release-18.09/tested";
current = false;
};
"nixos-18.09-small" = {
job = "nixos/release-18.09-small/tested";
current = false;
};
"nixpkgs-18.09-darwin" = {
job = "nixpkgs/nixpkgs-18.09-darwin/darwin-tested";
current = false;
};
};

channels-with-urls = (builtins.mapAttrs (name: about: about.job) channels);
2 changes: 0 additions & 2 deletions nixos-org/webserver.nix
Original file line number Diff line number Diff line change
@@ -88,8 +88,6 @@ in

nix.package = pkgs.nixUnstable;

nix.nixPath = [ "nixpkgs=channel:nixos-18.09-small" ];

security.pam.enableSSHAgentAuth = true;

services.httpd = {