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: c2e27c60b03b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4f4280428891
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 25, 2017

  1. rkt: 1.25.0 -> 1.26.0

    @NeQuissimus
    NeQuissimus committed May 25, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9237459 View commit details

Commits on May 26, 2017

  1. Merge pull request #26106 from NeQuissimus/rkt_1_26_0 

    rkt: 1.25.0 -> 1.26.0
    @NeQuissimus
    NeQuissimus authored May 26, 2017
    Copy the full SHA
    4f42804 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/virtualization/rkt/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/rkt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,15 +12,15 @@ let
stage1Dir = "lib/rkt/stage1-images";

in stdenv.mkDerivation rec {
version = "1.25.0";
version = "1.26.0";
name = "rkt-${version}";
BUILDDIR="build-${name}";

src = fetchFromGitHub {
owner = "coreos";
repo = "rkt";
rev = "v${version}";
sha256 = "0lcnhyaxq8z0ndwqg0svcc1gg0ahhcprxlf9gifm4mpxqimhaz8j";
sha256 = "16zwrx5v6pjjw1c6nbl19cchq71fj0bp5ci52rrfvl5mbn8xrs70";
};

stage1BaseImage = fetchurl {