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: 980bb95f1c93
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: aa2a7e49b825
Choose a head ref
  • 4 commits
  • 3 files changed
  • 4 contributors

Commits on Jul 5, 2019

  1. haskellPackages.servant-client-core: apply patch only to 0.15 

    A patch was added unconditionally that only applies to 0.15, breaking
builds of 0.14.

Apply patch only if version is 0.15
    Christian Höppner committed Jul 5, 2019
    Copy the full SHA
    d7ee2e2 View commit details

Commits on Jul 6, 2019

  1. graphicsmagick: 1.3.31 -> 1.3.32 

    security release fixing numerous issues, darwin requires patch to fix issue
with pngs
    @risicle
    risicle committed Jul 6, 2019

    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
    9826490 View commit details

  2. Merge pull request #64343 from mkaito/mkaito/haskell-fix-servant-014 

    haskellPackages.servant-client-core: apply patch only to 0.15
    @domenkozar
    domenkozar authored Jul 6, 2019
    Copy the full SHA
    da20f61 View commit details

  3. Merge pull request #64380 from risicle/ris-graphicsmagick-1-3-32 

    graphicsmagick: 1.3.31 -> 1.3.32, security release
    @grahamc
    grahamc authored Jul 6, 2019
    Copy the full SHA
    aa2a7e4 View commit details
42 changes: 42 additions & 0 deletions pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# reduced version of commit f30492f40f78d867b43422215057dd21de4ba447
# from upstream hg repository:
RegisterPNGImage(): Pass correct size value to strlcat().

diff -r 95c4711e8bee -r f30492f40f78 coders/png.c
--- a/coders/png.c Mon Jun 17 07:24:30 2019 -0500
+++ b/coders/png.c Mon Jun 17 18:54:43 2019 -0500
@@ -6427,26 +6427,26 @@

*version='\0';
#if defined(PNG_LIBPNG_VER_STRING)
- (void) strlcat(version,"libpng ",MaxTextExtent);
- (void) strlcat(version,PNG_LIBPNG_VER_STRING,MaxTextExtent);
+ (void) strlcat(version,"libpng ",sizeof(version));
+ (void) strlcat(version,PNG_LIBPNG_VER_STRING,sizeof(version));
#if (PNG_LIBPNG_VER > 10005)
if (LocaleCompare(PNG_LIBPNG_VER_STRING,png_get_header_ver(NULL)) != 0)
{
- (void) strlcat(version,",",MaxTextExtent);
- (void) strlcat(version,png_get_libpng_ver(NULL),MaxTextExtent);
+ (void) strlcat(version,",",sizeof(version));
+ (void) strlcat(version,png_get_libpng_ver(NULL),sizeof(version));
}
#endif
#endif

#if defined(ZLIB_VERSION)
if (*version != '\0')
- (void) strlcat(version,", ",MaxTextExtent);
- (void) strlcat(version,"zlib ",MaxTextExtent);
- (void) strlcat(version,ZLIB_VERSION,MaxTextExtent);
+ (void) strlcat(version,", ",sizeof(version));
+ (void) strlcat(version,"zlib ",sizeof(version));
+ (void) strlcat(version,ZLIB_VERSION,sizeof(version));
if (LocaleCompare(ZLIB_VERSION,zlib_version) != 0)
{
- (void) strlcat(version,",",MaxTextExtent);
- (void) strlcat(version,zlib_version,MaxTextExtent);
+ (void) strlcat(version,",",sizeof(version));
+ (void) strlcat(version,zlib_version,sizeof(version));
}
#endif
5 changes: 3 additions & 2 deletions pkgs/applications/graphics/graphicsmagick/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,15 +4,16 @@

stdenv.mkDerivation rec {
name = "graphicsmagick-${version}";
version = "1.3.31";
version = "1.3.32";

src = fetchurl {
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
sha256 = "0y22740f25qxsqqqg26xqlfp920dm57b7hrgaqmx7azksrcvnsq9";
sha256 = "1qclp9i31idpcbbqswmnq2q11lmv0a7cvdb1y72xcky8sshaahmq";
};

patches = [
./disable-popen.patch
./1.3.32-darwin-png-strlcat-fix.patch
];

configureFlags = [
6 changes: 5 additions & 1 deletion pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -492,7 +492,11 @@ self: super: builtins.intersectAttrs super {
servant-streaming-server = dontCheck super.servant-streaming-server;

# https://github.com/haskell-servant/servant/pull/1128
servant-client-core = appendPatch super.servant-client-core ./patches/servant-client-core-streamBody.patch;
servant-client-core = if (pkgs.lib.getVersion super.servant-client-core) == "0.15" then
appendPatch super.servant-client-core ./patches/servant-client-core-streamBody.patch
else
super.servant-client-core;


# tests run executable, relying on PATH
# without this, tests fail with "Couldn't launch intero process"