Skip to content

Commit 1869e7e

Browse files
FRidhFRidh
committedJan 1, 2018
Merge remote-tracking branch 'upstream/master' into HEAD
·
branch-off-24.1118.03-beta
2 parents e92a133 + 4d91763 commit 1869e7e

File tree

31 files changed

+407
-153
lines changed

31 files changed

+407
-153
lines changed
 

‎lib/maintainers.nix

+1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
bradediger = "Brad Ediger <brad@bradediger.com>";
9898
bramd = "Bram Duvigneau <bram@bramd.nl>";
9999
bstrik = "Berno Strik <dutchman55@gmx.com>";
100+
bugworm = "Roman Gerasimenko <bugworm@zoho.com>";
100101
bzizou = "Bruno Bzeznik <Bruno@bzizou.net>";
101102
c0bw3b = "Renaud <c0bw3b@gmail.com>";
102103
c0dehero = "CodeHero <codehero@nerdpol.ch>";

‎nixos/modules/services/mail/rspamd.nix

+11
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ let
3131
${mkBindSockets cfg.bindUISocket}
3232
.include "$CONFDIR/worker-controller.inc"
3333
}
34+
35+
${cfg.extraConfig}
3436
'';
3537

3638
in
@@ -79,6 +81,15 @@ in
7981
'';
8082
};
8183

84+
extraConfig = mkOption {
85+
type = types.lines;
86+
default = "";
87+
description = ''
88+
Extra configuration to add at the end of the rspamd configuration
89+
file.
90+
'';
91+
};
92+
8293
user = mkOption {
8394
type = types.string;
8495
default = "rspamd";

‎pkgs/applications/audio/gpodder/default.nix

+43-42
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,66 @@
1-
{ stdenv, fetchurl, fetchpatch, python2Packages, mygpoclient, intltool
1+
{ stdenv, fetchFromGitHub, python3, python3Packages, intltool
2+
, glibcLocales, gnome3, gtk3, wrapGAppsHook
23
, ipodSupport ? false, libgpod
3-
, gnome3
44
}:
55

6-
python2Packages.buildPythonApplication rec {
6+
python3Packages.buildPythonApplication rec {
77
name = "gpodder-${version}";
8+
version = "3.10.0";
89

9-
version = "3.9.3";
10+
format = "other";
1011

11-
src = fetchurl {
12-
url = "http://gpodder.org/src/${name}.tar.gz";
13-
sha256 = "1s83m90dic2zphwwv6wrvqx950y12v5sakm7q5nj5bnh5k9l2hgl";
12+
src = fetchFromGitHub {
13+
owner = "gpodder";
14+
repo = "gpodder";
15+
rev = version;
16+
sha256 = "0f3m1kcj641xiwsxan66k81lvslkl3aziakn5z17y4mmdci79jv0";
1417
};
1518

16-
patches = [
17-
(fetchpatch {
18-
sha256 = "1xkl1wnp46546jrzsnb9p0yj23776byg3nvsqwbblhqbsfipl48w";
19-
name = "Fix-soundcloud-feeds.patch";
20-
url = "https://github.com/gpodder/gpodder/commit/e7f34ad090cd276d75c0cd8d92ed97243d75db38.patch";
21-
})
22-
(fetchpatch {
23-
sha256 = "1jlldbinlxis1pi9p2lyczgbcv8nmdj66fxll6ph0klln0w8gvg4";
24-
name = "use-https-urls-for-soundcloud.patch";
25-
url = "https://github.com/gpodder/gpodder/commit/ef915dd3b6828174bf4f6f0911da410d9aca1b67.patch";
26-
})
27-
(fetchpatch {
28-
sha256 = "1l37ihzk7gfqcl5nnphv0sv80psm6fsg4qkxn6abc6v476axyj9b";
29-
name = "updates-soundcloud-support-to-recognize-https";
30-
url = "https://github.com/gpodder/gpodder/commit/5c1507671d93096ad0118f908c20dd1f182a72e0.patch";
31-
})
32-
];
33-
3419
postPatch = with stdenv.lib; ''
3520
sed -i -re 's,^( *gpodder_dir *= *).*,\1"'"$out"'",' bin/gpodder
36-
37-
makeWrapperArgs="--suffix XDG_DATA_DIRS : '${concatStringsSep ":" [
38-
"${gnome3.gnome_themes_standard}/share"
39-
"$XDG_ICON_DIRS"
40-
"$GSETTINGS_SCHEMAS_PATH"
41-
]}'"
4221
'';
4322

23+
nativeBuildInputs = [
24+
intltool
25+
python3Packages.wrapPython
26+
wrapGAppsHook
27+
glibcLocales
28+
];
29+
4430
buildInputs = [
45-
intltool python2Packages.coverage python2Packages.minimock
46-
gnome3.gnome_themes_standard gnome3.defaultIconTheme
47-
gnome3.gsettings_desktop_schemas
31+
python3
4832
];
4933

50-
propagatedBuildInputs = with python2Packages; [
51-
feedparser dbus-python mygpoclient pygtk eyeD3 podcastparser html5lib
34+
checkInputs = with python3Packages; [
35+
coverage minimock
36+
];
37+
38+
doCheck = true;
39+
40+
propagatedBuildInputs = with python3Packages; [
41+
feedparser
42+
dbus-python
43+
mygpoclient
44+
pygobject3
45+
eyeD3
46+
podcastparser
47+
html5lib
48+
gtk3
5249
] ++ stdenv.lib.optional ipodSupport libgpod;
5350

51+
makeFlags = [
52+
"PREFIX=$(out)"
53+
"share/applications/gpodder-url-handler.desktop"
54+
"share/applications/gpodder.desktop"
55+
"share/dbus-1/services/org.gpodder.service"
56+
];
57+
5458
preBuild = ''
55-
make PREFIX="$out" \
56-
share/applications/gpodder-url-handler.desktop \
57-
share/applications/gpodder.desktop \
58-
share/dbus-1/services/org.gpodder.service
59+
export LC_ALL="en_US.UTF-8"
5960
'';
6061

61-
checkPhase = ''
62-
LC_ALL=C python -m gpodder.unittests
62+
installCheckPhase = ''
63+
LC_ALL=C PYTHONPATH=./src:$PYTHONPATH python3 -m gpodder.unittests
6364
'';
6465

6566
meta = with stdenv.lib; {

‎pkgs/applications/editors/vscode/default.nix

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
33

44
let
5-
version = "1.19.0";
5+
version = "1.19.1";
66
channel = "stable";
77

88
plat = {
@@ -12,9 +12,9 @@ let
1212
}.${stdenv.system};
1313

1414
sha256 = {
15-
"i686-linux" = "036mdmma3b7iwinq1g6pxsn8vwx977hmjy3b4b0m84023phwm2x7";
16-
"x86_64-linux" = "089j9plq96d2px56gh1q4m9dhclb5xy0ca4b97rnnpdw93hhx94n";
17-
"x86_64-darwin" = "1q37bak2m966kfa5a87nzalnpa205gkjvb4zf1klmqipwqq4wm4d";
15+
"i686-linux" = "0ypx1jrzg76f8p4yh9hi3bhsrc6w4r7rg6i2aa6q7s8ny0q9hrlx";
16+
"x86_64-linux" = "1934wdiy2d1fzcjxjyf60dw1g1pp3lk2wv41xgrabfy5j2xfz14r";
17+
"x86_64-darwin" = "1zbcddgdwvmnk1gpmgw6rz0rswhkfc72wcjdbvgghm4msfwcgvc8";
1818
}.${stdenv.system};
1919

2020
archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";

‎pkgs/applications/misc/airspy/default.nix

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ stdenv, fetchFromGitHub
1+
{ stdenv, lib, fetchFromGitHub
22
, cmake , pkgconfig, libusb
33
}:
44

@@ -22,13 +22,14 @@ in
2222
nativeBuildInputs = [ cmake pkgconfig ];
2323
buildInputs = [ libusb ];
2424

25-
cmakeFlags = [ "-DINSTALL_UDEV_RULES=ON" ];
25+
cmakeFlags =
26+
lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" ];
2627

2728
meta = with stdenv.lib; {
2829
homepage = http://github.com/airspy/airspyone_host;
2930
description = "Host tools and driver library for the AirSpy SDR";
3031
license = licenses.free;
31-
platforms = platforms.linux;
32+
platforms = with platforms; linux ++ darwin;
3233
maintainers = with maintainers; [ markuskowa ];
3334
};
3435
}

‎pkgs/applications/misc/mupdf/darwin.patch

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
diff --git a/Makerules b/Makerules
2+
--- a/Makerules
3+
+++ b/Makerules
4+
@@ -81,22 +81,10 @@ HAVE_GLUT ?= yes
5+
SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
6+
SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
7+
8+
-CC = xcrun cc
9+
-AR = xcrun ar
10+
-LD = xcrun ld
11+
-RANLIB_CMD = xcrun ranlib $@
12+
-
13+
-# Linux uses pkg-config for system libraries.
14+
-else ifeq "$(OS)" "Linux"
15+
-
16+
HAVE_PTHREAD := yes
17+
SYS_PTHREAD_CFLAGS :=
18+
SYS_PTHREAD_LIBS := -lpthread
19+
20+
-HAVE_GLUT := yes
21+
-SYS_GLUT_CFLAGS :=
22+
-SYS_GLUT_LIBS := -lglut -lGL
23+
-
24+
ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes"
25+
HAVE_LIBCRYPTO := yes
26+
SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
27+
@@ -113,7 +101,7 @@ SYS_CURL_CFLAGS += $(shell pkg-config --cflags openssl)
28+
SYS_CURL_DEPS += $(shell pkg-config --libs openssl)
29+
endif
30+
endif
31+
-SYS_CURL_DEPS += -lpthread -lrt
32+
+SYS_CURL_DEPS += -lpthread
33+
34+
ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes"
35+
HAVE_X11 := yes

‎pkgs/applications/misc/mupdf/default.nix

+24-53
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
{ stdenv, lib, fetchurl, fetchpatch, pkgconfig
2-
, freetype, harfbuzz, openjpeg, jbig2dec, libjpeg
3-
, enableX11 ? true, libX11, libXext
1+
{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg
2+
, jbig2dec, libjpeg , darwin
3+
, enableX11 ? true, libX11, libXext, libXi, libXrandr
44
, enableCurl ? true, curl, openssl
5+
, enableGL ? true, freeglut, mesa_glu
56
}:
67

78
let
@@ -13,74 +14,44 @@ let
1314

1415

1516
in stdenv.mkDerivation rec {
16-
version = "1.11";
17+
version = "1.12.0";
1718
name = "mupdf-${version}";
1819

1920
src = fetchurl {
2021
url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz";
21-
sha256 = "02phamcchgsmvjnb3ir7r5sssvx9fcrscn297z73b82n1jl79510";
22+
sha256 = "0mc7a92zri27lk17wdr2iffarbfi4lvrmxhc53sz84hm5yl56qsw";
2223
};
2324

2425
patches = [
2526
# Compatibility with new openjpeg
2627
(fetchpatch {
27-
name = "mupdf-1.11-openjpeg-version.patch";
28-
url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/0001-mupdf-openjpeg.patch?h=packages/mupdf&id=c19349f42838e4dca02e564b97e0a5ab3e1b943f";
29-
sha256 = "0sx7jq84sr8bj6sg2ahg9cdgqz8dh4w6r0ah2yil8vrsznn4la8r";
28+
name = "mupdf-1.12-openjpeg-version.patch";
29+
url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/0001-mupdf-openjpeg.patch?h=packages/mupdf&id=a910cd33a2b311712f83710dc042fbe80c104306";
30+
sha256 = "05i9v2ia586jyjqdb7g68ss4vkfwgp6cwhagc8zzggsba83azyqk";
3031
})
32+
]
3133

32-
(fetchurl {
33-
name = "mupdf-1.11-CVE-2017-6060.patch";
34-
url = "http://git.ghostscript.com/?p=mupdf.git;a=blobdiff_plain;f=platform/x11/jstest_main.c;h=f158d9628ed0c0a84e37fe128277679e8334422a;hp=13c3a0a3ba3ff4aae29f6882d23740833c1d842f;hb=06a012a42c9884e3cd653e7826cff1ddec04eb6e;hpb=34e18d127a02146e3415b33c4b67389ce1ddb614";
35-
sha256 = "163bllvjrbm0gvjb25lv7b6sih4zr4g4lap3h0cbq8dvpjxx0jfc";
36-
})
37-
38-
(fetchpatch {
39-
name = "mupdf-1.11-shared_libs-1.patch";
40-
url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.11-shared_libs-1.patch";
41-
sha256 = "127x8jhyj3i9cn3mxw9mm5barw2yk43rvmghg54bhn4rjalx857j";
42-
})
34+
# Use shared libraries to decrease size
35+
++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.12-shared_libs-1.patch
4336

44-
(fetchurl {
45-
name = "mupdf-1.11-CVE-2017-14685.patch";
46-
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=ab1a420613dec93c686acbee2c165274e922f82a";
47-
sha256 = "120xapwj0af333n3a32ypxk0jmjv2ia476jg8pzsfqk9a5qqkx46";
48-
})
49-
50-
(fetchurl {
51-
name = "mupdf-1.11-CVE-2017-14686.patch";
52-
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=0f0fbc07d9be31f5e83ec5328d7311fdfd8328b1";
53-
sha256 = "0pkn7mfqhmnsyia4rh4mw4q435bzvlc22crqa1bxpaa0gcyky51c";
54-
})
55-
56-
(fetchurl {
57-
name = "mupdf-1.11-CVE-2017-14687.patch";
58-
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2b16dbd8f73269cb15ca61ece75cf8d2d196ed28";
59-
sha256 = "01v41cwrdnz3k32fcadk2gk4knqrm3mavzp6pxhn19nwgmqkshjd";
60-
})
61-
62-
(fetchurl {
63-
name = "mupdf-1.11-CVE-2017-15587.patch";
64-
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=82df2631d7d0446b206ea6b434ea609b6c28b0e8";
65-
sha256 = "04kfww7y0wazg6372g44fa2k5kiiigq4616ihkvmp18rz86903n9";
66-
})
67-
68-
(fetchurl {
69-
name = "mupdf-1.11-CVE-2017-15369.patch";
70-
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=c2663e51238ec8256da7fc61ad580db891d9fe9a";
71-
sha256 = "0xx2mrbjcymi3gh0l3cq81m6bygp9dv79v1kyrbcvpl5z6wgl71y";
72-
})
73-
];
37+
++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch
38+
;
7439

7540
postPatch = ''
7641
sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c
7742
'';
7843

7944
makeFlags = [ "prefix=$(out)" ];
8045
nativeBuildInputs = [ pkgconfig ];
81-
buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg ]
82-
++ lib.optionals enableX11 [ libX11 libXext ]
83-
++ lib.optionals enableCurl [ curl openssl ];
46+
buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut mesa_glu ]
47+
++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ]
48+
++ lib.optionals enableCurl [ curl openssl ]
49+
++ lib.optionals enableGL (
50+
if stdenv.isDarwin then
51+
with darwin.apple_sdk.frameworks; [ GLUT OpenGL ]
52+
else
53+
[ freeglut mesa_glu ])
54+
;
8455
outputs = [ "bin" "dev" "out" "man" "doc" ];
8556

8657
preConfigure = ''
@@ -123,6 +94,6 @@ in stdenv.mkDerivation rec {
12394
description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C";
12495
license = licenses.agpl3Plus;
12596
maintainers = with maintainers; [ viric vrthra fpletz ];
126-
platforms = platforms.linux;
97+
platforms = platforms.unix;
12798
};
12899
}

‎pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
--- mupdf-1.12.0-source.orig/Makefile 2017-12-13 15:00:30.000000000 +0100
2+
+++ mupdf-1.12.0-source/Makefile 2017-12-31 00:05:23.003277481 +0100
3+
@@ -14,7 +14,7 @@
4+
# Do not specify CFLAGS or LIBS on the make invocation line - specify
5+
# XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
6+
# set a variable that was set on the command line.
7+
-CFLAGS += $(XCFLAGS) -Iinclude
8+
+CFLAGS += $(XCFLAGS) -Iinclude -fPIC
9+
LIBS += $(XLIBS) -lm
10+
11+
LIBS += $(FREETYPE_LIBS)
12+
@@ -312,9 +312,9 @@
13+
14+
# --- Library ---
15+
16+
-MUPDF_LIB = $(OUT)/libmupdf.a
17+
-THIRD_LIB = $(OUT)/libmupdfthird.a
18+
-THREAD_LIB = $(OUT)/libmuthreads.a
19+
+MUPDF_LIB = $(OUT)/libmupdf.so
20+
+THIRD_LIB = $(OUT)/libmupdfthird.so
21+
+THREAD_LIB = $(OUT)/libmuthreads.so
22+
23+
MUPDF_OBJ := \
24+
$(FITZ_OBJ) \
25+
@@ -343,11 +343,14 @@
26+
27+
THREAD_OBJ := $(THREAD_OBJ)
28+
29+
-$(MUPDF_LIB) : $(MUPDF_OBJ)
30+
+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB)
31+
+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined
32+
$(THIRD_LIB) : $(THIRD_OBJ)
33+
+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so -Wl,--no-undefined
34+
$(THREAD_LIB) : $(THREAD_OBJ)
35+
+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmuthreads.so -Wl,--no-undefined -lpthread
36+
37+
-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
38+
+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
39+
40+
# --- Tools and Apps ---
41+

‎pkgs/applications/misc/udiskie/default.nix

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{ stdenv, fetchFromGitHub, asciidoc-full, gettext
22
, gobjectIntrospection, gtk3, hicolor_icon_theme, libnotify, librsvg
33
, udisks2, wrapGAppsHook
4+
, buildPythonApplication
45
, docopt
56
, pygobject3
67
, pyyaml
7-
, pythonPackages
8+
, ...
89
}:
910

10-
pythonPackages.buildPythonApplication rec {
11+
buildPythonApplication rec {
1112
name = "udiskie-${version}";
1213
version = "1.7.3";
1314

0 commit comments

Comments
 (0)
Please sign in to comment.