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

Commits on May 8, 2017

  1. debian: 8.7 -> 8.8 

    (cherry picked from commit 31c2d20)
    @edolstra
    edolstra committed May 8, 2017
    Copy the full SHA
    ce201f4 View commit details

  2. man-pages: 4.09 -> 4.11 

    (cherry picked from commit b7ed6ef)
    @edolstra
    edolstra committed May 8, 2017
    Copy the full SHA
    8bc45d3 View commit details
Showing with 8 additions and 8 deletions.
  1. +6 −6 pkgs/build-support/vm/default.nix
  2. +2 −2 pkgs/data/documentation/man-pages/default.nix
12 changes: 6 additions & 6 deletions pkgs/build-support/vm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1954,22 +1954,22 @@ rec {
};

debian8i386 = {
name = "debian-8.7-jessie-i386";
fullName = "Debian 8.7 Jessie (i386)";
name = "debian-8.8-jessie-i386";
fullName = "Debian 8.8 Jessie (i386)";
packagesList = fetchurl {
url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz;
sha256 = "71cacb934dc4ab2e67a5ed215ccbc9836cf8d95687edec7e7fe8d3916e3b3fe8";
sha256 = "79dbf81e9698913c577333f47f5a56be78529fba265ec492880e8c369c478b58";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
};

debian8x86_64 = {
name = "debian-8.7-jessie-amd64";
fullName = "Debian 8.7 Jessie (amd64)";
name = "debian-8.8-jessie-amd64";
fullName = "Debian 8.8 Jessie (amd64)";
packagesList = fetchurl {
url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz;
sha256 = "b4cfbaaef31f05ce1726d00f0a173f5b6f33a9192513302319a49848884a17f3";
sha256 = "845fc80c9934d8c0f78ada6455c81c331a3359ef15c4c036b47e742fb1bb99c6";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
4 changes: 2 additions & 2 deletions pkgs/data/documentation/man-pages/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "man-pages-${version}";
version = "4.09";
version = "4.11";

src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
sha256 = "1740gq9sq28dp5a5sjn1ya7cvrv8mbky6knb7734v8k29a7a0x55";
sha256 = "097m0gsbaz0gf9ir4lmph3h5jj6wmydk1rglfz82dysybx4q1pmd";
};

makeFlags = [ "MANDIR=$(out)/share/man" ];