From a04e8c89912f374b9dd02fcd242a699ee451c936 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 22 Nov 2017 19:41:06 +0100 Subject: [PATCH 1/2] Remove the Travis build status image from the README This information isn't useful anymore since we disabled all Travis CI builds in 44917c46b1c398997a2e0786903000d44b6ab668. --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 64cfb25eac3..fbcdf785f75 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ [logo](https://nixos.org/nixos) -[![Build Status](https://travis-ci.org/NixOS/nixpkgs.svg?branch=master)](https://travis-ci.org/NixOS/nixpkgs) [![Code Triagers Badge](https://www.codetriage.com/nixos/nixpkgs/badges/users.svg)](https://www.codetriage.com/nixos/nixpkgs) Nixpkgs is a collection of packages for the [Nix](https://nixos.org/nix/) package From 2b7a6e31fd5c7ccacc0a52f88d8b846dd4e14a72 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 22 Nov 2017 19:48:48 +0100 Subject: [PATCH 2/2] README: Use HTTPS for all hyperlinks They redirect to HTTPS anyway. This also contains some minor content changes. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fbcdf785f75..3f2ff48dd92 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -[logo](https://nixos.org/nixos) +[logo](https://nixos.org/nixos) [![Code Triagers Badge](https://www.codetriage.com/nixos/nixpkgs/badges/users.svg)](https://www.codetriage.com/nixos/nixpkgs) Nixpkgs is a collection of packages for the [Nix](https://nixos.org/nix/) package -manager. It is periodically built and tested by the [hydra](http://hydra.nixos.org/) +manager. It is periodically built and tested by the [Hydra](https://hydra.nixos.org/) build daemon as so-called channels. To get channel information via git, add [nixpkgs-channels](https://github.com/NixOS/nixpkgs-channels.git) as a remote: @@ -22,7 +22,7 @@ release and `nixos-unstable` for the latest successful build of master: For pull-requests, please rebase onto nixpkgs `master`. -[NixOS](https://nixos.org/nixos/) linux distribution source code is located inside +[NixOS](https://nixos.org/nixos/) Linux distribution source code is located inside `nixos/` folder. * [NixOS installation instructions](https://nixos.org/nixos/manual/#ch-installation)