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

Commits on Jun 17, 2017

  1. imagemagick7: 7.0.5-7 -> 7.0.6-0

    @fpletz
    fpletz committed Jun 17, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9be1951 View commit details

  2. imagemagick: 6.9.8-9 -> 6.9.8-10

    @fpletz
    fpletz committed Jun 17, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5f803db View commit details

  3. kernelPackages.zfs: 0.6.5.9 -> 0.6.5.10

    @fpletz
    fpletz committed Jun 17, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    de74d20 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/ImageMagick/7.0.nix
View file
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ let
else throw "ImageMagick is not supported on this platform.";

cfg = {
version = "7.0.5-7";
sha256 = "11k53193az0bvdhp4gz2g9p8fb6r5fr1h74dnfx6ijfnfj80hbgp";
version = "7.0.6-0";
sha256 = "1vl9mkdp5pskl4lxd1p79ayv1k3gxpa8iz992d302qyllhm7wn1i";
patches = [];
};
in
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/ImageMagick/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ let
else throw "ImageMagick is not supported on this platform.";

cfg = {
version = "6.9.8-9";
sha256 = "0wr6wcmvaw62f6pkgnpqnjmp331wfwmds9wmqzr4zv53s9k1lkzn";
version = "6.9.8-10";
sha256 = "040qs7nwcm84bjd9wryvd58zqfykbmn3y3qfc90lnldww7v6ihlg";
patches = [];
}
# Freeze version on mingw so we don't need to port the patch too often.
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/spl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -62,8 +62,8 @@ in
assert buildKernel -> kernel != null;
{
splStable = common {
version = "0.6.5.9";
sha256 = "15qpx2nhprmk14jgb7yqp9dvfb6i3hhhspi77kvian171b0a6112";
version = "0.6.5.10";
sha256 = "1zdxggpdz9j0lpcqfnkvf4iym7mp2k246sg1s4frqaw1pwwcw9vi";
};
splUnstable = common {
version = "0.7.0-rc4";
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/zfs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -123,12 +123,12 @@ in
# to be adapted
zfsStable = common {
# comment/uncomment if breaking kernel versions are known
incompatibleKernelVersion = "4.11";
incompatibleKernelVersion = "4.12";

version = "0.6.5.9";
version = "0.6.5.10";

# this package should point to the latest release.
sha256 = "1m8q39j13k46fn0pw3adq87c20rpkg28llxgv2a90994p4127xh0";
sha256 = "04gn5fj22z17zq2nazxwl3j9dr33l79clha6ipxvdz241bhjqrk3";
extraPatches = [
(fetchpatch {
url = "https://github.com/Mic92/zfs/compare/zfs-0.6.5.8...nixos-zfs-0.6.5.8.patch";