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: 1ab6de18d24a
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: caacbe98ce1d
Choose a head ref
  • 5 commits
  • 3 files changed
  • 4 contributors

Commits on Jun 8, 2019

  1. nixos/tests/docker-tools: check layer sharing with buildLayeredImage 

    Adapted from grahamc's blog post on layered Docker images in Nix:

https://grahamc.com/blog/nix-and-layered-docker-images
(cherry picked from commit 3b0d5b5)
    @danieldk @nlewo
    danieldk authored and nlewo committed Jun 8, 2019
    Copy the full SHA
    5f97866 View commit details

  2. riot-web: 1.0.6 -> 1.0.7 

    (cherry picked from commit f97effd)
    @pacien @fpletz
    pacien authored and fpletz committed Jun 8, 2019
    Copy the full SHA
    5912504 View commit details

  3. riot-web: 1.0.7 -> 1.0.8 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/riot-web/versions

(cherry picked from commit 58d1128)
    @r-ryantm @fpletz
    r-ryantm authored and fpletz committed Jun 8, 2019
    Copy the full SHA
    035d45a View commit details

  4. riot-web: 1.0.8 -> 1.1.0 

    (cherry picked from commit adc9db2)
    @nyanloutre @fpletz
    nyanloutre authored and fpletz committed Jun 8, 2019
    Copy the full SHA
    6bb2860 View commit details

  5. riot-web: 1.1.0 -> 1.2.1 

    (cherry picked from commit 06195c9)
    @nyanloutre @fpletz
    nyanloutre authored and fpletz committed Jun 8, 2019
    Copy the full SHA
    caacbe9 View commit details
Showing with 16 additions and 2 deletions.
  1. +6 −0 nixos/tests/docker-tools.nix
  2. +2 −2 pkgs/applications/networking/instant-messengers/riot/riot-web.nix
  3. +8 −0 pkgs/build-support/docker/examples.nix
6 changes: 6 additions & 0 deletions nixos/tests/docker-tools.nix
View file
Original file line number Diff line number Diff line change
@@ -68,6 +68,12 @@ import ./make-test.nix ({ pkgs, ... }: {
$docker->succeed("docker load --input='${pkgs.dockerTools.examples.layered-on-top}'");
$docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layered-on-top.imageName}");
# Ensure layers are shared between images
$docker->succeed("docker load --input='${pkgs.dockerTools.examples.another-layered-image}'");
$docker->succeed("docker inspect ${pkgs.dockerTools.examples.layered-image.imageName} | ${pkgs.jq}/bin/jq -r '.[] | .RootFS.Layers | .[]' | sort > layers1.sha256");
$docker->succeed("docker inspect ${pkgs.dockerTools.examples.another-layered-image.imageName} | ${pkgs.jq}/bin/jq -r '.[] | .RootFS.Layers | .[]' | sort > layers2.sha256");
$docker->succeed('[ $(comm -1 -2 layers1.sha256 layers2.sha256 | wc -l) -ne 0 ]');
# Ensure order of layers is correct
$docker->succeed("docker load --input='${pkgs.dockerTools.examples.layersOrder}'");
$docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layersOrder.imageName} cat /tmp/layer1 | grep -q layer1");
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/riot/riot-web.nix
View file
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@
let configFile = writeText "riot-config.json" conf; in
stdenv.mkDerivation rec {
name= "riot-web-${version}";
version = "1.0.6";
version = "1.2.1";

src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "09sm1k3iypqn93iazfx10y4bqz06d2h8f0902sgrj5qbnaq4jcxr";
sha256 = "1h96c4yy06ag5lmsbm5h2ws1l7sp4qm5dcchw25k3937fdhwq840";
};

installPhase = ''
8 changes: 8 additions & 0 deletions pkgs/build-support/docker/examples.nix
View file
Original file line number Diff line number Diff line change
@@ -225,4 +225,12 @@ rec {
'';
};

# 14. Create another layered image, for comparing layers with image 10.
another-layered-image = pkgs.dockerTools.buildLayeredImage {
name = "another-layered-image";
tag = "latest";
config.Cmd = [ "${pkgs.hello}/bin/hello" ];
contents = [ pkgs.hello ];
};

}