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

Commits on Sep 26, 2017

  1. imagemagick: 6.9.9-7 -> 6.9.9-15 for multiple CVEs 

    Too many CVEs to list because they are not tracked upstream by release
versions.

(cherry picked from commit 2d854c4)
    @fpletz
    fpletz committed Sep 26, 2017
    Copy the full SHA
    614c302 View commit details

  2. imagemagick7: 7.0.6-4 -> 7.0.7-4 for multiple CVEs 

    Too many CVEs to list because they are not tracked upstream by release
versions.

(cherry picked from commit de4abf7)
    @fpletz
    fpletz committed Sep 26, 2017
    Copy the full SHA
    defa5d6 View commit details

  3. libressl_2_6: 2.6.0 -> 2.6.2 

    (cherry picked from commit 4d7d5c8)
    @fpletz
    fpletz committed Sep 26, 2017
    Copy the full SHA
    abaa8ce 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
@@ -14,8 +14,8 @@ let
else throw "ImageMagick is not supported on this platform.";

cfg = {
version = "7.0.6-4";
sha256 = "0fvkx9lf8g0sa9bccd9s5qyhcy0g1mqnkbpqly55ryxyg1ywxqaz";
version = "7.0.7-4";
sha256 = "074w4jm5s98b8dxwjl8lljvdhmm3mbg1ikgjy1mw3c1sb08z3nc8";
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
@@ -14,8 +14,8 @@ let
else throw "ImageMagick is not supported on this platform.";

cfg = {
version = "6.9.9-7";
sha256 = "1lwsz9b8clygdppgawv2hsry4aykgmawjlwhg3fj70rndv4a8rw4";
version = "6.9.9-15";
sha256 = "0bxgdc1qiyvag6a2iiqcbwp4ak0m1mzi9qhs51fbrvv6syy12m6c";
patches = [];
}
# Freeze version on mingw so we don't need to port the patch too often.
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libressl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ in {
};

libressl_2_6 = generic {
version = "2.6.0";
sha256 = "0lwapvfda4zj4r0kxn9ys43l5wyfgpljmhq0j1lr45spfis5b3g4";
version = "2.6.2";
sha256 = "0y64grb2zx98rjp2lbwihyhbml4z5ih3v7ydbxdvmabj5d4x4adh";
};
}