mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 20:34:52 +03:00
Graham Christensen
GitHub
commit
4d26238690
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
name = "game-music-emu-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://game-music-emu.googlecode.com/files/${name}.tar.bz2";
|
||||
sha256 = "11s9l938nxbrk7qb2k1ppfgizcz00cakbxgv0gajc6hyqv882vjh";
|
||||
url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${name}.tar.bz2";
|
||||
sha256 = "08fk7zddpn7v93d0fa7fcypx7hvgwx9b5psj9l6m8b87k2hbw4fw";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake ];
|
||||
|
||||
@ -2,8 +2,19 @@
|
||||
|
||||
let
|
||||
# Xen 4.5.5
|
||||
#
|
||||
# Patching XEN? Check the XSAs and try applying all the ones we
|
||||
# don't have yet.
|
||||
#
|
||||
# XSAs at: https://xenbits.xen.org/xsa/
|
||||
xenConfig = rec {
|
||||
version = "4.5.5";
|
||||
|
||||
xsaPatch = { name , sha256 }: (fetchpatch {
|
||||
url = "https://xenbits.xen.org/xsa/xsa${name}.patch";
|
||||
inherit sha256;
|
||||
});
|
||||
|
||||
name = "xen-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
@ -52,25 +63,60 @@ let
|
||||
}
|
||||
];
|
||||
|
||||
xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
|
||||
./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
|
||||
./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
|
||||
(fetchpatch {
|
||||
url = "https://bugzilla.redhat.com/attachment.cgi?id=1218547";
|
||||
name = "CVE-2016-9385.patch";
|
||||
sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://bugzilla.redhat.com/attachment.cgi?id=1218536";
|
||||
name = "CVE-2016-9377-CVE-2016-9378-part1.patch";
|
||||
sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://bugzilla.redhat.com/attachment.cgi?id=1218537";
|
||||
name = "CVE-2016-9377-CVE-2016-9378-part2.patch";
|
||||
sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz";
|
||||
})
|
||||
];
|
||||
# Note this lacks patches for:
|
||||
# XSA-201
|
||||
# XSA-199
|
||||
# XSA-197
|
||||
# they didn't apply, and there are plenty of other patches here
|
||||
# to get this deployed as-is.
|
||||
xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
|
||||
./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
|
||||
./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
|
||||
(xsaPatch {
|
||||
name = "190-4.5";
|
||||
sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm";
|
||||
})
|
||||
(xsaPatch {
|
||||
name = "191-4.6";
|
||||
sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg";
|
||||
})
|
||||
(xsaPatch {
|
||||
name = "192-4.5";
|
||||
sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm";
|
||||
})
|
||||
(xsaPatch {
|
||||
name = "193-4.5";
|
||||
sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr";
|
||||
})
|
||||
(xsaPatch {
|
||||
name = "195";
|
||||
sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7";
|
||||
})
|
||||
(xsaPatch {
|
||||
name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject";
|
||||
sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6";
|
||||
})
|
||||
(xsaPatch {
|
||||
name = "196-0002-x86-svm-Fix-injection-of-software-interrupts";
|
||||
sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz";
|
||||
})
|
||||
(xsaPatch {
|
||||
name = "198";
|
||||
sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9";
|
||||
})
|
||||
(xsaPatch {
|
||||
name = "200-4.6";
|
||||
sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7";
|
||||
})
|
||||
(xsaPatch {
|
||||
name = "202-4.6";
|
||||
sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f";
|
||||
})
|
||||
(xsaPatch {
|
||||
name = "204-4.5";
|
||||
sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
in callPackage ./generic.nix (args // { xenConfig=xenConfig; })
|
||||
|
||||
@ -5,4 +5,12 @@ callPackage ./generic.nix (args // rec {
|
||||
branch = "2.1";
|
||||
revision = "v2.1.2";
|
||||
sha256 = "0kdcl9sqjz0vagli4ad6bxq1r8ma086m0prpkm5x3dxp37hpjp8h";
|
||||
|
||||
patches = [
|
||||
# Fetched from https://github.com/szukw000/openjpeg/commit/cadff5fb6e73398de26a92e96d3d7cac893af255
|
||||
# Referenced from https://bugzilla.redhat.com/show_bug.cgi?id=1405135
|
||||
# Put in our source code to make sure we don't lose it, since that
|
||||
# referenced commit is someone else's fork, and not actually up-stream.
|
||||
./CVE-2016-9580-and-CVE-2016-9581.patch
|
||||
];
|
||||
})
|
||||
|
||||
@ -0,0 +1,242 @@
|
||||
From cadff5fb6e73398de26a92e96d3d7cac893af255 Mon Sep 17 00:00:00 2001
|
||||
From: szukw000 <szukw000@arcor.de>
|
||||
Date: Fri, 9 Dec 2016 08:29:55 +0100
|
||||
Subject: [PATCH] These changes repair bugs of #871 and #872
|
||||
|
||||
---
|
||||
src/bin/jp2/converttif.c | 107 +++++++++++++++++++++++++++++++----------------
|
||||
1 file changed, 70 insertions(+), 37 deletions(-)
|
||||
|
||||
diff --git a/src/bin/jp2/converttif.c b/src/bin/jp2/converttif.c
|
||||
index 143d3be..c690f8b 100644
|
||||
--- a/src/bin/jp2/converttif.c
|
||||
+++ b/src/bin/jp2/converttif.c
|
||||
@@ -553,20 +553,18 @@ static void tif_32sto16u(const OPJ_INT32* pSrc, OPJ_UINT16* pDst, OPJ_SIZE_T len
|
||||
|
||||
int imagetotif(opj_image_t * image, const char *outfile)
|
||||
{
|
||||
- int width, height;
|
||||
- int bps,adjust, sgnd;
|
||||
- int tiPhoto;
|
||||
+ uint32 width, height, bps, tiPhoto;
|
||||
+ int adjust, sgnd;
|
||||
TIFF *tif;
|
||||
tdata_t buf;
|
||||
- tsize_t strip_size;
|
||||
+ tmsize_t strip_size, rowStride;
|
||||
OPJ_UINT32 i, numcomps;
|
||||
- OPJ_SIZE_T rowStride;
|
||||
OPJ_INT32* buffer32s = NULL;
|
||||
OPJ_INT32 const* planes[4];
|
||||
convert_32s_PXCX cvtPxToCx = NULL;
|
||||
convert_32sXXx_C1R cvt32sToTif = NULL;
|
||||
|
||||
- bps = (int)image->comps[0].prec;
|
||||
+ bps = (uint32)image->comps[0].prec;
|
||||
planes[0] = image->comps[0].data;
|
||||
|
||||
numcomps = image->numcomps;
|
||||
@@ -674,13 +672,13 @@ int imagetotif(opj_image_t * image, const char *outfile)
|
||||
break;
|
||||
}
|
||||
sgnd = (int)image->comps[0].sgnd;
|
||||
- adjust = sgnd ? 1 << (image->comps[0].prec - 1) : 0;
|
||||
- width = (int)image->comps[0].w;
|
||||
- height = (int)image->comps[0].h;
|
||||
+ adjust = sgnd ? (int)(1 << (image->comps[0].prec - 1)) : 0;
|
||||
+ width = (uint32)image->comps[0].w;
|
||||
+ height = (uint32)image->comps[0].h;
|
||||
|
||||
TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, width);
|
||||
TIFFSetField(tif, TIFFTAG_IMAGELENGTH, height);
|
||||
- TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, numcomps);
|
||||
+ TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, (uint32)numcomps);
|
||||
TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps);
|
||||
TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
|
||||
TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
|
||||
@@ -688,8 +686,8 @@ int imagetotif(opj_image_t * image, const char *outfile)
|
||||
TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, 1);
|
||||
|
||||
strip_size = TIFFStripSize(tif);
|
||||
- rowStride = ((OPJ_SIZE_T)width * numcomps * (OPJ_SIZE_T)bps + 7U) / 8U;
|
||||
- if (rowStride != (OPJ_SIZE_T)strip_size) {
|
||||
+ rowStride = (width * numcomps * bps + 7U) / 8U;
|
||||
+ if (rowStride != strip_size) {
|
||||
fprintf(stderr, "Invalid TIFF strip size\n");
|
||||
TIFFClose(tif);
|
||||
return 1;
|
||||
@@ -699,7 +697,7 @@ int imagetotif(opj_image_t * image, const char *outfile)
|
||||
TIFFClose(tif);
|
||||
return 1;
|
||||
}
|
||||
- buffer32s = (OPJ_INT32 *)malloc((OPJ_SIZE_T)width * numcomps * sizeof(OPJ_INT32));
|
||||
+ buffer32s = (OPJ_INT32 *)malloc((OPJ_SIZE_T)(width * numcomps * sizeof(OPJ_INT32)));
|
||||
if (buffer32s == NULL) {
|
||||
_TIFFfree(buf);
|
||||
TIFFClose(tif);
|
||||
@@ -1211,20 +1209,19 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
|
||||
TIFF *tif;
|
||||
tdata_t buf;
|
||||
tstrip_t strip;
|
||||
- tsize_t strip_size;
|
||||
+ tmsize_t strip_size;
|
||||
int j, currentPlane, numcomps = 0, w, h;
|
||||
OPJ_COLOR_SPACE color_space = OPJ_CLRSPC_UNKNOWN;
|
||||
opj_image_cmptparm_t cmptparm[4]; /* RGBA */
|
||||
opj_image_t *image = NULL;
|
||||
int has_alpha = 0;
|
||||
- unsigned short tiBps, tiPhoto, tiSf, tiSpp, tiPC;
|
||||
- unsigned int tiWidth, tiHeight;
|
||||
+ uint32 tiBps, tiPhoto, tiSf, tiSpp, tiPC, tiWidth, tiHeight;
|
||||
OPJ_BOOL is_cinema = OPJ_IS_CINEMA(parameters->rsiz);
|
||||
convert_XXx32s_C1R cvtTifTo32s = NULL;
|
||||
convert_32s_CXPX cvtCxToPx = NULL;
|
||||
OPJ_INT32* buffer32s = NULL;
|
||||
OPJ_INT32* planes[4];
|
||||
- OPJ_SIZE_T rowStride;
|
||||
+ tmsize_t rowStride;
|
||||
|
||||
tif = TIFFOpen(filename, "r");
|
||||
|
||||
@@ -1243,22 +1240,35 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
|
||||
TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &tiSpp);
|
||||
TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &tiPhoto);
|
||||
TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &tiPC);
|
||||
- w= (int)tiWidth;
|
||||
- h= (int)tiHeight;
|
||||
-
|
||||
- if(tiBps > 16U) {
|
||||
- fprintf(stderr,"tiftoimage: Bits=%d, Only 1 to 16 bits implemented\n",tiBps);
|
||||
- fprintf(stderr,"\tAborting\n");
|
||||
+
|
||||
+ if(tiSpp == 0 || tiSpp > 4) { /* should be 1 ... 4 */
|
||||
+ fprintf(stderr,"tiftoimage: Bad value for samples per pixel == %hu.\n"
|
||||
+ "\tAborting.\n", tiSpp);
|
||||
+ TIFFClose(tif);
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ if(tiBps > 16U || tiBps == 0) {
|
||||
+ fprintf(stderr,"tiftoimage: Bad values for Bits == %d.\n"
|
||||
+ "\tMax. 16 Bits are allowed here.\n\tAborting.\n",tiBps);
|
||||
TIFFClose(tif);
|
||||
return NULL;
|
||||
}
|
||||
if(tiPhoto != PHOTOMETRIC_MINISBLACK && tiPhoto != PHOTOMETRIC_RGB) {
|
||||
- fprintf(stderr,"tiftoimage: Bad color format %d.\n\tOnly RGB(A) and GRAY(A) has been implemented\n",(int) tiPhoto);
|
||||
+ fprintf(stderr,"tiftoimage: Bad color format %d.\n"
|
||||
+ "\tOnly RGB(A) and GRAY(A) has been implemented\n",(int) tiPhoto);
|
||||
fprintf(stderr,"\tAborting\n");
|
||||
TIFFClose(tif);
|
||||
return NULL;
|
||||
}
|
||||
-
|
||||
+ if(tiWidth == 0 || tiHeight == 0) {
|
||||
+ fprintf(stderr,"tiftoimage: Bad values for width(%u) "
|
||||
+ "and/or height(%u)\n\tAborting.\n",tiWidth,tiHeight);
|
||||
+ TIFFClose(tif);
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ w= (int)tiWidth;
|
||||
+ h= (int)tiHeight;
|
||||
+
|
||||
switch (tiBps) {
|
||||
case 1:
|
||||
case 2:
|
||||
@@ -1312,7 +1322,7 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
|
||||
|
||||
TIFFGetFieldDefaulted(tif, TIFFTAG_EXTRASAMPLES,
|
||||
&extrasamples, &sampleinfo);
|
||||
-
|
||||
+
|
||||
if(extrasamples >= 1)
|
||||
{
|
||||
switch(sampleinfo[0])
|
||||
@@ -1333,7 +1343,7 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
|
||||
else /* extrasamples == 0 */
|
||||
if(tiSpp == 4 || tiSpp == 2) has_alpha = 1;
|
||||
}
|
||||
-
|
||||
+
|
||||
/* initialize image components */
|
||||
memset(&cmptparm[0], 0, 4 * sizeof(opj_image_cmptparm_t));
|
||||
|
||||
@@ -1346,7 +1356,7 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
|
||||
} else {
|
||||
is_cinema = 0U;
|
||||
}
|
||||
-
|
||||
+
|
||||
if(tiPhoto == PHOTOMETRIC_RGB) /* RGB(A) */
|
||||
{
|
||||
numcomps = 3 + has_alpha;
|
||||
@@ -1384,10 +1394,24 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
|
||||
image->x0 = (OPJ_UINT32)parameters->image_offset_x0;
|
||||
image->y0 = (OPJ_UINT32)parameters->image_offset_y0;
|
||||
image->x1 = !image->x0 ? (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1 :
|
||||
- image->x0 + (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1;
|
||||
+ image->x0 + (OPJ_UINT32)(w - 1) * (OPJ_UINT32)subsampling_dx + 1;
|
||||
+ if(image->x1 <= image->x0) {
|
||||
+ fprintf(stderr,"tiftoimage: Bad value for image->x1(%d) vs. "
|
||||
+ "image->x0(%d)\n\tAborting.\n",image->x1,image->x0);
|
||||
+ TIFFClose(tif);
|
||||
+ opj_image_destroy(image);
|
||||
+ return NULL;
|
||||
+ }
|
||||
image->y1 = !image->y0 ? (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1 :
|
||||
- image->y0 + (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1;
|
||||
-
|
||||
+ image->y0 + (OPJ_UINT32)(h - 1) * (OPJ_UINT32)subsampling_dy + 1;
|
||||
+ if(image->y1 <= image->y0) {
|
||||
+ fprintf(stderr,"tiftoimage: Bad value for image->y1(%d) vs. "
|
||||
+ "image->y0(%d)\n\tAborting.\n",image->y1,image->y0);
|
||||
+ TIFFClose(tif);
|
||||
+ opj_image_destroy(image);
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
for(j = 0; j < numcomps; j++)
|
||||
{
|
||||
planes[j] = image->comps[j].data;
|
||||
@@ -1395,15 +1419,15 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
|
||||
image->comps[numcomps - 1].alpha = (OPJ_UINT16)(1 - (numcomps & 1));
|
||||
|
||||
strip_size = TIFFStripSize(tif);
|
||||
-
|
||||
+
|
||||
buf = _TIFFmalloc(strip_size);
|
||||
if (buf == NULL) {
|
||||
TIFFClose(tif);
|
||||
opj_image_destroy(image);
|
||||
return NULL;
|
||||
}
|
||||
- rowStride = ((OPJ_SIZE_T)w * tiSpp * tiBps + 7U) / 8U;
|
||||
- buffer32s = (OPJ_INT32 *)malloc((OPJ_SIZE_T)w * tiSpp * sizeof(OPJ_INT32));
|
||||
+ rowStride = (w * tiSpp * tiBps + 7U) / 8U;
|
||||
+ buffer32s = (OPJ_INT32 *)malloc((OPJ_SIZE_T)(w * tiSpp * sizeof(OPJ_INT32)));
|
||||
if (buffer32s == NULL) {
|
||||
_TIFFfree(buf);
|
||||
TIFFClose(tif);
|
||||
@@ -1421,11 +1445,20 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
|
||||
for(; (h > 0) && (strip < TIFFNumberOfStrips(tif)); strip++)
|
||||
{
|
||||
const OPJ_UINT8 *dat8;
|
||||
- OPJ_SIZE_T ssize;
|
||||
+ tmsize_t ssize;
|
||||
|
||||
- ssize = (OPJ_SIZE_T)TIFFReadEncodedStrip(tif, strip, buf, strip_size);
|
||||
+ ssize = TIFFReadEncodedStrip(tif, strip, buf, strip_size);
|
||||
+ if(ssize < 1 || ssize > strip_size) {
|
||||
+ fprintf(stderr,"tiftoimage: Bad value for ssize(%ld) "
|
||||
+ "vs. strip_size(%ld).\n\tAborting.\n",ssize,strip_size);
|
||||
+ _TIFFfree(buf);
|
||||
+ _TIFFfree(buffer32s);
|
||||
+ TIFFClose(tif);
|
||||
+ opj_image_destroy(image);
|
||||
+ return NULL;
|
||||
+ }
|
||||
dat8 = (const OPJ_UINT8*)buf;
|
||||
-
|
||||
+
|
||||
while (ssize >= rowStride) {
|
||||
cvtTifTo32s(dat8, buffer32s, (OPJ_SIZE_T)w * tiSpp);
|
||||
cvtCxToPx(buffer32s, planes, (OPJ_SIZE_T)w);
|
||||
@ -11,7 +11,7 @@
|
||||
, testsSupport ? false
|
||||
, jdk ? null
|
||||
# Inherit generics
|
||||
, branch, version, revision, sha256, ...
|
||||
, branch, version, revision, sha256, patches ? [], ...
|
||||
}:
|
||||
|
||||
assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null;
|
||||
@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -1,15 +1,28 @@
|
||||
{ fetchurl, stdenv }:
|
||||
{ fetchFromGitHub, stdenv, autoconf, automake, libtool }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libupnp-1.6.20";
|
||||
name = "libupnp-${version}";
|
||||
version = "1.6.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/pupnp/${name}.tar.bz2";
|
||||
sha256 = "0qrsdsb1qm85hc4jy04qph895613d148f0x1mmk6z99y3q43fdgf";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrjimenez";
|
||||
repo = "pupnp";
|
||||
rev = "release-${version}";
|
||||
sha256 = "10583dkz1l5sjp2833smql8w428x2nbh1fni8j6h9rji6ma2yhs0";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
libtool
|
||||
];
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
preConfigure = ''
|
||||
./bootstrap
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "libupnp, an open source UPnP development kit for Linux";
|
||||
|
||||
|
||||
@ -51,14 +51,13 @@ in {
|
||||
|
||||
tomcat85 = common {
|
||||
versionMajor = "8";
|
||||
versionMinor = "5.8";
|
||||
sha256 = "1rfws897m09pbnb1jc4684didpklfhqp86szv2jcqzdx0hlfxxs0";
|
||||
versionMinor = "5.9";
|
||||
sha256 = "1dy8bf18jwyi6p7ayb96gbhd4iyfq4d37s3qxnlll8vklfx388np";
|
||||
};
|
||||
|
||||
tomcatUnstable = common {
|
||||
versionMajor = "9";
|
||||
versionMinor = "0.0.M13";
|
||||
sha256 = "0im3w4iqpar7x50vg7c9zkxyqf9x53xs5jvcq79xqgrmcqb9lk91";
|
||||
versionMinor = "0.0.M15";
|
||||
sha256 = "1spbq5vh2dplp83ki3fbbwl0klxq36s4rwkpcjdnwjxjymg9k432";
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nagios-${version}";
|
||||
version = "4.2.3";
|
||||
version = "4.2.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz";
|
||||
sha256 = "0p16sm5pkbzf4py30hwzm38194cl23wfzsvkhk4jkf3p1fq7xvl3";
|
||||
sha256 = "0w0blbwiw0ps04b7gkyyk89qkgwsxh6gydhmggbm1kl3ar3mq1dh";
|
||||
};
|
||||
|
||||
patches = [ ./nagios.patch ];
|
||||
|
||||
@ -3059,12 +3059,12 @@ in {
|
||||
};
|
||||
|
||||
bottle = buildPythonPackage rec {
|
||||
version = "0.12.9";
|
||||
version = "0.12.11";
|
||||
name = "bottle-${version}";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/b/bottle/${name}.tar.gz";
|
||||
sha256 = "0l80a1qkg7zbi8s077brfgm5w4ypwxgq9rvsvw16snc5jfsj82py";
|
||||
sha256 = "0cd787lzggs933qfav6xicx5c78dz6npwgg3xc4rhah44nbqz5d1";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with self; [ setuptools ];
|
||||
|
||||
Loading…
Reference in New Issue
Block a user