tjh.dev
Merge branch release-19.03 into staging-19.03
+5
maintainers/maintainer-list.nix
+5
maintainers/maintainer-list.nix
+6
-1
nixos/doc/manual/release-notes/rl-1903.xml
+6
-1
nixos/doc/manual/release-notes/rl-1903.xml
···
3
3
xmlns:xi="http://www.w3.org/2001/XInclude"
4
4
version="5.0"
5
5
xml:id="sec-release-19.03">
6
-
<title>Release 19.03 (“Koi”, 2019/03/??)</title>
6
+
<title>Release 19.03 (“Koi”, 2019/04/11)</title>
7
7
8
8
<section xmlns="http://docbook.org/ns/docbook"
9
9
xmlns:xlink="http://www.w3.org/1999/xlink"
···
18
18
</para>
19
19
20
20
<itemizedlist>
21
+
<listitem>
22
+
<para>
23
+
End of support is planned for end of October 2019, handing over to 19.09.
24
+
</para>
25
+
</listitem>
21
26
<listitem>
22
27
<para>
23
28
The default Python 3 interpreter is now CPython 3.7 instead of CPython
+8
-1
nixos/modules/security/apparmor.nix
+8
-1
nixos/modules/security/apparmor.nix
···
29
29
config = mkIf cfg.enable {
30
30
environment.systemPackages = [ pkgs.apparmor-utils ];
31
31
32
+
boot.kernelParams = [ "apparmor=1" "security=apparmor" ];
33
+
32
34
systemd.services.apparmor = let
33
35
paths = concatMapStrings (s: " -I ${s}/etc/apparmor.d")
34
36
([ pkgs.apparmor-profiles ] ++ cfg.packages);
35
37
in {
36
-
wantedBy = [ "local-fs.target" ];
38
+
after = [ "local-fs.target" ];
39
+
before = [ "sysinit.target" ];
40
+
wantedBy = [ "multi-user.target" ];
41
+
unitConfig = {
42
+
DefaultDependencies = "no";
43
+
};
37
44
serviceConfig = {
38
45
Type = "oneshot";
39
46
RemainAfterExit = "yes";
+10
nixos/tests/hardened.nix
+10
nixos/tests/hardened.nix
···
30
30
''
31
31
$machine->waitForUnit("multi-user.target");
32
32
33
+
subtest "apparmor-loaded", sub {
34
+
$machine->succeed("systemctl status apparmor.service");
35
+
};
36
+
37
+
# AppArmor securityfs
38
+
subtest "apparmor-securityfs", sub {
39
+
$machine->succeed("mountpoint -q /sys/kernel/security");
40
+
$machine->succeed("cat /sys/kernel/security/apparmor/profiles");
41
+
};
42
+
33
43
# Test loading out-of-tree modules
34
44
subtest "extra-module-packages", sub {
35
45
$machine->succeed("grep -Fq wireguard /proc/modules");
+3
-3
pkgs/applications/misc/electrum/default.nix
+3
-3
pkgs/applications/misc/electrum/default.nix
···
1
1
{ stdenv, fetchurl, fetchFromGitHub, python3, python3Packages, zbar, secp256k1 }:
2
2
3
3
let
4
-
version = "3.3.5";
4
+
version = "3.3.6";
5
5
6
6
qdarkstyle = python3Packages.buildPythonPackage rec {
7
7
pname = "QDarkStyle";
···
18
18
owner = "spesmilo";
19
19
repo = "electrum";
20
20
rev = version;
21
-
sha256 = "11rzzrv5xxqazcb7q1ig93d6cisqmd1x0jrgvfgzysbzvi51gg11";
21
+
sha256 = "0s8i6fn1jwk80d036n4c7csv4qnx2k15f6347kr4mllglcpa9hb3";
22
22
23
23
extraPostFetch = ''
24
24
mv $out ./all
···
33
33
34
34
src = fetchurl {
35
35
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
36
-
sha256 = "1csj0n96zlajnrs39wsazfj5lmy7v7n77cdz56lr8nkmchh6k9z1";
36
+
sha256 = "0am5ki3z0yvhrz16vp2jjy5fkxxqph0mj9qqpbw3kpql65shykwz";
37
37
};
38
38
39
39
postUnpack = ''
+22
-1
pkgs/applications/misc/k2pdfopt/default.nix
+22
-1
pkgs/applications/misc/k2pdfopt/default.nix
···
57
57
prePatch = ''
58
58
cp ${src}/leptonica_mod/{allheaders.h,dewarp2.c,leptwin.c} src/
59
59
'';
60
-
patches = [];
60
+
patches = [
61
+
# stripped down copy of upstream commit b88c821f8d347bce0aea86d606c710303919f3d2
62
+
./leptonica-CVE-2018-3836.patch
63
+
(fetchpatch {
64
+
# CVE-2018-7186
65
+
url = "https://github.com/DanBloomberg/leptonica/commit/"
66
+
+ "ee301cb2029db8a6289c5295daa42bba7715e99a.patch";
67
+
sha256 = "0cgb7mvz2px1rg5i80wk1wxxjvzjga617d8q6j7qygkp7jm6495d";
68
+
})
69
+
(fetchpatch {
70
+
# CVE-2018-7247
71
+
url = "https://github.com/DanBloomberg/leptonica/commit/"
72
+
+ "c1079bb8e77cdd426759e466729917ca37a3ed9f.patch";
73
+
sha256 = "1z4iac5gwqggh7aa8cvyp6nl9fwd1v7wif26caxc9y5qr3jj34qf";
74
+
})
75
+
(fetchpatch {
76
+
# CVE-2018-7440
77
+
url = "https://github.com/DanBloomberg/leptonica/commit/"
78
+
+ "49ecb6c2dfd6ed5078c62f4a8eeff03e3beced3b.patch";
79
+
sha256 = "1hjmva98iaw9xj7prg7aimykyayikcwnk4hk0380007hqb35lqmy";
80
+
})
81
+
];
61
82
});
62
83
tesseract_modded = tesseract4.override {
63
84
tesseractBase = tesseract4.tesseractBase.overrideAttrs (_: {
+95
pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch
+95
pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch
···
1
+
--- a/src/allheaders.h
2
+
+++ b/src/allheaders.h
3
+
@@ -2600,6 +2600,7 @@
4
+
LEPT_DLL extern char * stringReverse ( const char *src );
5
+
LEPT_DLL extern char * strtokSafe ( char *cstr, const char *seps, char **psaveptr );
6
+
LEPT_DLL extern l_int32 stringSplitOnToken ( char *cstr, const char *seps, char **phead, char **ptail );
7
+
+LEPT_DLL extern l_int32 stringCheckForChars ( const char *src, const char *chars, l_int32 *pfound );
8
+
LEPT_DLL extern char * stringRemoveChars ( const char *src, const char *remchars );
9
+
LEPT_DLL extern l_int32 stringFindSubstr ( const char *src, const char *sub, l_int32 *ploc );
10
+
LEPT_DLL extern char * stringReplaceSubstr ( const char *src, const char *sub1, const char *sub2, l_int32 *pfound, l_int32 *ploc );
11
+
--- a/src/gplot.c
12
+
+++ b/src/gplot.c
13
+
@@ -141,9 +141,10 @@
14
+
const char *xlabel,
15
+
const char *ylabel)
16
+
{
17
+
-char *newroot;
18
+
-char buf[L_BUF_SIZE];
19
+
-GPLOT *gplot;
20
+
+char *newroot;
21
+
+char buf[L_BUF_SIZE];
22
+
+l_int32 badchar;
23
+
+GPLOT *gplot;
24
+
25
+
PROCNAME("gplotCreate");
26
+
27
+
@@ -152,6 +153,9 @@
28
+
if (outformat != GPLOT_PNG && outformat != GPLOT_PS &&
29
+
outformat != GPLOT_EPS && outformat != GPLOT_LATEX)
30
+
return (GPLOT *)ERROR_PTR("outformat invalid", procName, NULL);
31
+
+ stringCheckForChars(rootname, "`;&|><\"?*", &badchar);
32
+
+ if (badchar) /* danger of command injection */
33
+
+ return (GPLOT *)ERROR_PTR("invalid rootname", procName, NULL);
34
+
35
+
if ((gplot = (GPLOT *)LEPT_CALLOC(1, sizeof(GPLOT))) == NULL)
36
+
return (GPLOT *)ERROR_PTR("gplot not made", procName, NULL);
37
+
--- a/src/utils2.c
38
+
+++ b/src/utils2.c
39
+
@@ -42,6 +42,7 @@
40
+
* l_int32 stringSplitOnToken()
41
+
*
42
+
* Find and replace string and array procs
43
+
+ * l_int32 stringCheckForChars()
44
+
* char *stringRemoveChars()
45
+
* l_int32 stringFindSubstr()
46
+
* char *stringReplaceSubstr()
47
+
@@ -701,6 +702,48 @@
48
+
/*--------------------------------------------------------------------*
49
+
* Find and replace procs *
50
+
*--------------------------------------------------------------------*/
51
+
+/*!
52
+
+ * \brief stringCheckForChars()
53
+
+ *
54
+
+ * \param[in] src input string; can be of zero length
55
+
+ * \param[in] chars string of chars to be searched for in %src
56
+
+ * \param[out] pfound 1 if any characters are found; 0 otherwise
57
+
+ * \return 0 if OK, 1 on error
58
+
+ *
59
+
+ * <pre>
60
+
+ * Notes:
61
+
+ * (1) This can be used to sanitize an operation by checking for
62
+
+ * special characters that don't belong in a string.
63
+
+ * </pre>
64
+
+ */
65
+
+l_int32
66
+
+stringCheckForChars(const char *src,
67
+
+ const char *chars,
68
+
+ l_int32 *pfound)
69
+
+{
70
+
+char ch;
71
+
+l_int32 i, n;
72
+
+
73
+
+ PROCNAME("stringCheckForChars");
74
+
+
75
+
+ if (!pfound)
76
+
+ return ERROR_INT("&found not defined", procName, 1);
77
+
+ *pfound = FALSE;
78
+
+ if (!src || !chars)
79
+
+ return ERROR_INT("src and chars not both defined", procName, 1);
80
+
+
81
+
+ n = strlen(src);
82
+
+ for (i = 0; i < n; i++) {
83
+
+ ch = src[i];
84
+
+ if (strchr(chars, ch)) {
85
+
+ *pfound = TRUE;
86
+
+ break;
87
+
+ }
88
+
+ }
89
+
+ return 0;
90
+
+}
91
+
+
92
+
+
93
+
/*!
94
+
* \brief stringRemoveChars()
95
+
*
+2
-2
pkgs/applications/networking/browsers/chromium/plugins.nix
+2
-2
pkgs/applications/networking/browsers/chromium/plugins.nix
···
100
100
101
101
flash = stdenv.mkDerivation rec {
102
102
name = "flashplayer-ppapi-${version}";
103
-
version = "32.0.0.171";
103
+
version = "32.0.0.192";
104
104
105
105
src = fetchzip {
106
106
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
107
-
sha256 = "1rqf1kidpf2jqf20dw3hscrapdpm2j751742i6xnvj9mp66nczyg";
107
+
sha256 = "14nydiqjvr7hc4dmn900p7j7rp6prwyaf6xnki2ssbq6h1ni2lg1";
108
108
stripRoot = false;
109
109
};
110
110
+9
-9
pkgs/applications/networking/browsers/chromium/upstream-info.nix
+9
-9
pkgs/applications/networking/browsers/chromium/upstream-info.nix
···
1
1
# This file is autogenerated from update.sh in the same directory.
2
2
{
3
3
beta = {
4
-
sha256 = "0vsvjhmrc2p8mf4rfp9bf9y4nqkbbi5v8008cdvr6c14zq35w7hy";
5
-
sha256bin64 = "1zzmk08y2rhirm297a91bvq5q30vvxll8fzfp7z5cpqb6az80y2h";
6
-
version = "74.0.3729.108";
4
+
sha256 = "01sw6ql4fr1zwbw4l4c3xgmd3jqil9lgmpmlhfyj9ga4kp2qlnim";
5
+
sha256bin64 = "0xwxb54l1ylrckxd36pkzcla34d5hbnhxz3gkrv4id530l6ms6jh";
6
+
version = "75.0.3770.27";
7
7
};
8
8
dev = {
9
-
sha256 = "1wrg4r2q043i8i4vq9zn69yvnzjxzmxyn21k367909kci83hhi44";
10
-
sha256bin64 = "1jv9wi4nddijjp9y0r77rxciqsd1rkd87ipvagyq5nzpxr6wdzsa";
11
-
version = "75.0.3766.2";
9
+
sha256 = "0fq8sjyscz998ha4wnn4npr3bb4jslcjc1i7xgwz6bh4yhi1az4f";
10
+
sha256bin64 = "1yb6ff6bg662klki7dcrdaysmsnqrnlp8syxcvwl2rysswll3wyl";
11
+
version = "76.0.3788.1";
12
12
};
13
13
stable = {
14
-
sha256 = "0vsvjhmrc2p8mf4rfp9bf9y4nqkbbi5v8008cdvr6c14zq35w7hy";
15
-
sha256bin64 = "0zs3khzszppmjf5s4rs6fbmhgc9y0abj4q4q8j3hn6nisddi9q9c";
16
-
version = "74.0.3729.108";
14
+
sha256 = "01ifjsss3nqr15xx2iqsiqgjq1xc07j7ljnapsb484m7dcfk3gnw";
15
+
sha256bin64 = "0zkv4x4vbra476c6wy4igp6k80r9ssb9632wsyrzjni9w3zk9qvy";
16
+
version = "74.0.3729.157";
17
17
};
18
18
}
+5
-5
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+5
-5
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
···
74
74
in
75
75
stdenv.mkDerivation rec {
76
76
name = "flashplayer-${version}";
77
-
version = "32.0.0.171";
77
+
version = "32.0.0.192";
78
78
79
79
src = fetchurl {
80
80
url =
···
85
85
sha256 =
86
86
if debug then
87
87
if arch == "x86_64" then
88
-
"0dl2kxsn4wh3243qkwyq13ikbmz6ljg95a1v02cylz36kpfl51iv"
88
+
"0n5m70mz1fa5pgpz1ldqgn6bkr4in5qjn79kb85127wmg8fddbz7"
89
89
else
90
-
"1v9imcyml55qlvp0cibi5r5kl0rcivzvmnqgw8ph3xjm1yrxw3fr"
90
+
"1q6pjmnw2h8k09va5x64ijmq0kmfb569rwcibwl0d8kylxi97b6v"
91
91
else
92
92
if arch == "x86_64" then
93
-
"1f3nl4qkws16q2yw940vvb0zmmwxks1blm4ida65hlda6f9zfq3h"
93
+
"1h2ya3szq24dczv2izxy47kr2raiahxx7zvm49jlvlcp5cygxvjk"
94
94
else
95
-
"0df9nbxyn4wl4ap333mgnnmy994xj7i5hz07sw83pszlz3pjkc0m";
95
+
"084bv0m9w1v2s4bf5rgan40l1fajwfam3njvgm47ffyg6s0kg1kh";
96
96
};
97
97
98
98
nativeBuildInputs = [ unzip ];
+3
-3
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+3
-3
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
···
50
50
51
51
stdenv.mkDerivation rec {
52
52
name = "flashplayer-standalone-${version}";
53
-
version = "32.0.0.171";
53
+
version = "32.0.0.192";
54
54
55
55
src = fetchurl {
56
56
url =
···
60
60
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
61
61
sha256 =
62
62
if debug then
63
-
"0z4fkqbq1s63lpzfkyxllwx2wpizbabr4zim1dn7n59ld75vjxq8"
63
+
"0j5rzamyajkiblalqkimx29bwm7yg9m4nj9z7z8hahcywpf81yqg"
64
64
else
65
-
"0nvgcdmgvgbj6axrh0yzkk437bxwsaxl0mvfkcyyz1hxnq51dvvg";
65
+
"0qnz383aggm07hbvyrnqphwhd5wp9xbairf908nk4i6ad8wg1x3r";
66
66
};
67
67
68
68
nativeBuildInputs = [ unzip ];
+15
-17
pkgs/applications/science/math/nasc/default.nix
+15
-17
pkgs/applications/science/math/nasc/default.nix
···
2
2
, fetchFromGitHub
3
3
, pkgconfig
4
4
, gtk3
5
+
, glib
5
6
, pantheon
6
-
, gnome3
7
+
, libsoup
7
8
, gtksourceview
8
9
, libgee
9
10
, cmake
10
11
, libqalculate
11
-
, gobject-introspection
12
-
, wrapGAppsHook }:
12
+
, cln
13
+
, wrapGAppsHook
14
+
}:
13
15
14
16
stdenv.mkDerivation rec {
15
-
name = "nasc-${version}";
16
-
version = "0.5.1";
17
+
pname = "nasc";
18
+
version = "0.5.4";
17
19
18
20
src = fetchFromGitHub {
19
21
owner = "parnold-x";
20
-
repo = "nasc";
22
+
repo = pname;
21
23
rev = version;
22
-
sha256 = "13y5fnm7g3xgdxmdydlgly73nigh8maqbf9d6c9bpyzxkxq1csy5";
24
+
sha256 = "036v3dx8yasp19j88lflibqnpfi5d0nk7qkcnr80zn1lvawf4wgn";
23
25
};
24
26
25
-
postPatch = ''
26
-
# libqalculatenasc.so is not installed, and nasc fails to start
27
-
substituteInPlace libqalculatenasc/CMakeLists.txt --replace SHARED STATIC
28
-
'';
29
-
30
27
nativeBuildInputs = [
31
28
cmake
32
29
pantheon.vala
33
-
gobject-introspection # for setup-hook
34
30
pkgconfig
35
31
wrapGAppsHook
36
32
];
37
33
38
34
buildInputs = [
39
-
pantheon.elementary-icon-theme
35
+
cln
36
+
libsoup
37
+
gtk3
38
+
glib
40
39
gtksourceview
41
40
libgee
42
-
gnome3.libsoup
43
-
pantheon.granite
44
-
gtk3
45
41
libqalculate
42
+
pantheon.elementary-icon-theme
43
+
pantheon.granite
46
44
];
47
45
48
46
meta = with stdenv.lib; {
+11
-1
pkgs/applications/video/devede/default.nix
+11
-1
pkgs/applications/video/devede/default.nix
···
1
1
{ stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor
2
-
, gtk3, gettext, wrapGAppsHook, gdk_pixbuf }:
2
+
, gtk3, gettext, wrapGAppsHook, gdk_pixbuf, gobject-introspection }:
3
3
4
4
let
5
5
inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3;
···
15
15
sha256 = "0ncb8nykchrjlllbzfjpvirmfvfaps9qhilc56kvcw3nzqrnkx8q";
16
16
};
17
17
18
+
# Temporary fix
19
+
# See https://github.com/NixOS/nixpkgs/issues/61578
20
+
# and https://github.com/NixOS/nixpkgs/issues/56943
21
+
strictDeps = false;
22
+
18
23
nativeBuildInputs = [
19
24
gettext wrapGAppsHook
25
+
26
+
# Temporary fix
27
+
# See https://github.com/NixOS/nixpkgs/issues/61578
28
+
# and https://github.com/NixOS/nixpkgs/issues/56943
29
+
gobject-introspection
20
30
];
21
31
22
32
buildInputs = [
+7
-2
pkgs/applications/window-managers/awesome/default.nix
+7
-2
pkgs/applications/window-managers/awesome/default.nix
···
5
5
, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
6
6
, libxkbcommon, xcbutilxrm, hicolor-icon-theme
7
7
, asciidoctor
8
+
, gtk3Support ? false, gtk3 ? null
8
9
}:
10
+
11
+
# needed for beautiful.gtk to work
12
+
assert gtk3Support -> gtk3 != null;
9
13
10
14
with luaPackages; stdenv.mkDerivation rec {
11
15
name = "awesome-${version}";
···
36
40
xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence
37
41
xorg.xcbutil xorg.xcbutilimage xorg.xcbutilkeysyms
38
42
xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon
39
-
xcbutilxrm ];
43
+
xcbutilxrm ]
44
+
++ stdenv.lib.optional gtk3Support gtk3;
40
45
41
46
#cmakeFlags = "-DGENERATE_MANPAGES=ON";
42
47
cmakeFlags = "-DOVERRIDE_VERSION=${version}";
···
48
53
LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;;";
49
54
50
55
postInstall = ''
51
-
# Don't use wrapProgram or or the wrapper will duplicate the --search
56
+
# Don't use wrapProgram or the wrapper will duplicate the --search
52
57
# arguments every restart
53
58
mv "$out/bin/awesome" "$out/bin/.awesome-wrapped"
54
59
makeWrapper "$out/bin/.awesome-wrapped" "$out/bin/awesome" \
+2
-2
pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+2
-2
pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
···
4
4
5
5
stdenv.mkDerivation rec {
6
6
name = "gnome-desktop-${version}";
7
-
version = "3.30.2.1";
7
+
version = "3.30.2.2";
8
8
9
9
outputs = [ "out" "dev" "devdoc" ];
10
10
11
11
src = fetchurl {
12
12
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
13
-
sha256 = "07s95fpfl3kjq51yxbrx6q87w812pq6bl0xdn0zzyi6qvg33m00v";
13
+
sha256 = "02ksmq2h4jjvjalp5x6d6v36qnp1h66qxwv2gl7kbx7dxqcp6ys3";
14
14
};
15
15
16
16
enableParallelBuilding = true;
+3
-3
pkgs/desktops/gnome-3/core/mutter/3.28.nix
+3
-3
pkgs/desktops/gnome-3/core/mutter/3.28.nix
···
6
6
7
7
stdenv.mkDerivation rec {
8
8
pname = "mutter";
9
-
version = "3.28.3";
9
+
version = "3.28.4";
10
10
11
11
src = fetchFromGitLab {
12
12
domain = "gitlab.gnome.org";
13
13
owner = "GNOME";
14
14
repo = pname;
15
-
rev = "4af8d9d4752a94612a98d619e65828f0070a7b0e"; # HEAD of https://gitlab.gnome.org/GNOME/mutter/tree/gnome-3-28
16
-
sha256 = "1rmc1bf80yq776xhygi1jzgia1y44j2mr2n94vlxgzqc0whamx2v";
15
+
rev = version;
16
+
sha256 = "0p8ky306dnm4alkncmsnd8r2awpsi37p0bzvkv313pgqw2hbwq9i";
17
17
};
18
18
19
19
patches = [
+2
-8
pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+2
-8
pkgs/desktops/pantheon/apps/elementary-photos/default.nix
···
5
5
6
6
stdenv.mkDerivation rec {
7
7
pname = "photos";
8
-
version = "2.6.3";
8
+
version = "2.6.4";
9
9
10
10
name = "elementary-${pname}-${version}";
11
11
···
13
13
owner = "elementary";
14
14
repo = pname;
15
15
rev = version;
16
-
sha256 = "1s0ww5g26wj0gd1drj8gxs74gvg2c9fdj4ixpifj8jh8yafdmrvg";
16
+
sha256 = "17r9658s0pqy6s45ysi3915sm8hpvmsp7cw2jahqvjc61r4qpdc1";
17
17
};
18
18
19
19
passthru = {
···
64
64
65
65
mesonFlags = [
66
66
"-Dplugins=false"
67
-
];
68
-
69
-
patches = [
70
-
# https://github.com/elementary/photos/pull/505
71
-
# Unrelated line got dropped in https://github.com/elementary/photos/pull/498
72
-
./fix-missing-line.patch
73
67
];
74
68
75
69
postPatch = ''
-21
pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch
-21
pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch
···
1
-
From 88ee69b57f94efa2779595d1544109fed6a3211c Mon Sep 17 00:00:00 2001
2
-
From: Fabio Valentini <decathorpe@gmail.com>
3
-
Date: Tue, 16 Apr 2019 16:12:47 +0200
4
-
Subject: [PATCH] photos/PhotoMetadata: fix issue introduced with PR #498
5
-
6
-
---
7
-
src/photos/PhotoMetadata.vala | 1 +
8
-
1 file changed, 1 insertion(+)
9
-
10
-
diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala
11
-
index f0a4a73b..34dcbb55 100644
12
-
--- a/src/photos/PhotoMetadata.vala
13
-
+++ b/src/photos/PhotoMetadata.vala
14
-
@@ -197,6 +197,7 @@ public class PhotoMetadata : MediaMetadata {
15
-
#else
16
-
exiv2.from_app1_segment (buffer, length);
17
-
#endif
18
-
+ exif = Exif.Data.new_from_data (buffer, length);
19
-
source_name = "<app1 segment %d bytes>".printf (length);
20
-
}
21
-
+3
-3
pkgs/desktops/pantheon/desktop/gala/default.nix
+3
-3
pkgs/desktops/pantheon/desktop/gala/default.nix
···
5
5
6
6
stdenv.mkDerivation rec {
7
7
pname = "gala";
8
-
version = "unstable-2019-02-09"; # Is tracking https://github.com/elementary/gala/commits/stable/juno
8
+
version = "unstable-2019-05-14"; # Is tracking https://github.com/elementary/gala/commits/stable/juno
9
9
10
10
src = fetchFromGitHub {
11
11
owner = "elementary";
12
12
repo = pname;
13
-
rev = "1a96644c6aac405927499dacb308dea13512e919";
14
-
sha256 = "1zi7xyzhsypf52zzfwf7dwcxgd0skxbsssv1vsxgmswszg23p7i3";
13
+
rev = "3ae100da4bbd9dabe353f468778ef63ef2dcd5d7";
14
+
sha256 = "08xcj4z9mq511w8hdpr60nmd6j1cj7rs7rgs4s5ivyg11kg5w17b";
15
15
};
16
16
17
17
passthru = {
+8
pkgs/development/libraries/libsass/default.nix
+8
pkgs/development/libraries/libsass/default.nix
···
9
9
sha256 = "0w6v1xa00jvfyk4b29ir7dfkhiq72anz015gg580bi7x3n7saz28";
10
10
};
11
11
12
+
patches = [
13
+
(fetchpatch {
14
+
name = "CVE-2018-19827.patch";
15
+
url = "https://github.com/sass/libsass/commit/b21fb9f84096d9927780b86fa90629a096af358d.patch";
16
+
sha256 = "0ix12x9plmpgs3xda2fjdcykca687h16qfwqr57i5qphjr9vp33l";
17
+
})
18
+
];
19
+
12
20
preConfigure = ''
13
21
export LIBSASS_VERSION=${version}
14
22
'';
+1
-1
pkgs/development/misc/stm32/betaflight/default.nix
+1
-1
pkgs/development/misc/stm32/betaflight/default.nix
···
33
33
sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev.
34
34
sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex
35
35
36
-
substitutateInPlace Makefile \
36
+
substituteInPlace Makefile \
37
37
--replace "--specs=nano.specs" ""
38
38
'';
39
39
+3
-3
pkgs/development/python-modules/rednose/default.nix
+3
-3
pkgs/development/python-modules/rednose/default.nix
···
13
13
substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0"
14
14
'';
15
15
16
-
# Do not test on Python 2 darwin because the tests suite gets stuck
17
-
# https://github.com/JBKahn/rednose/issues/23
18
-
doCheck = !(stdenv.isDarwin && isPy27);
16
+
# Do not test on Python 2 because the tests suite gets stuck
17
+
# https://github.com/NixOS/nixpkgs/issues/60786
18
+
doCheck = !(isPy27);
19
19
20
20
checkInputs = [ six ];
21
21
propagatedBuildInputs = [ nose colorama termstyle ];
+20
-19
pkgs/development/tools/misc/saleae-logic/default.nix
+20
-19
pkgs/development/tools/misc/saleae-logic/default.nix
···
9
9
{ stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft
10
10
, fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor
11
11
, freetype, libXinerama, libxcb, zlib, pciutils
12
-
, makeDesktopItem, xkeyboardconfig, runtimeShell
12
+
, makeDesktopItem, xkeyboardconfig, dbus, runtimeShell, libGL
13
13
}:
14
14
15
15
let
···
17
17
libPath = stdenv.lib.makeLibraryPath [
18
18
glib libSM libICE gtk2 libXext libXft fontconfig libXrender libXfixes libX11
19
19
libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc.lib
20
+
dbus libGL
20
21
];
21
22
22
23
in
24
+
25
+
assert stdenv.hostPlatform.system == "x86_64-linux";
23
26
24
27
stdenv.mkDerivation rec {
25
28
pname = "saleae-logic";
26
-
version = "1.2.10";
29
+
version = "1.2.18";
27
30
name = "${pname}-${version}";
28
31
29
-
src =
30
-
if stdenv.hostPlatform.system == "i686-linux" then
31
-
fetchurl {
32
-
name = "saleae-logic-${version}-32bit.zip";
33
-
url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(32-bit).zip";
34
-
sha256 = "1dyrj07cgj2fvwi1sk97vady9ri8f8n7mxy9zyzmw9isngs7bmll";
35
-
}
36
-
else if stdenv.hostPlatform.system == "x86_64-linux" then
37
-
fetchurl {
38
-
name = "saleae-logic-${version}-64bit.zip";
39
-
url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip";
40
-
sha256 = "1skx2pfnic7pyss7c69qb7kg2xvflpxf112xkf9awk516dw1w4h7";
41
-
}
42
-
else
43
-
throw "Saleae Logic software requires i686-linux or x86_64-linux";
32
+
src = fetchurl {
33
+
name = "saleae-logic-${version}-64bit.zip";
34
+
url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip";
35
+
sha256 = "0lhair2vsg8sjvzicvfcjfmvy30q7i01xj4z02iqh7pgzpb025h8";
36
+
};
44
37
45
38
desktopItem = makeDesktopItem {
46
39
name = "saleae-logic";
···
61
54
62
55
# Patch it
63
56
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/Logic"
64
-
patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$out/Logic"
57
+
for bin in "$out/Logic" \
58
+
"$out/libQt5Widgets.so.5" \
59
+
"$out/libQt5Gui.so.5" \
60
+
"$out/libQt5Core.so.5" \
61
+
"$out/libQt5Network.so.5" ; do
62
+
patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$bin"
63
+
done
64
+
65
+
patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/../" "$out/platforms/libqxcb.so"
65
66
66
67
# Build the LD_PRELOAD library that makes Logic work from a read-only directory
67
68
mkdir -p "$out/lib"
···
91
92
description = "Software for Saleae logic analyzers";
92
93
homepage = http://www.saleae.com/;
93
94
license = licenses.unfree;
94
-
platforms = [ "x86_64-linux" "i686-linux" ];
95
+
platforms = platforms.linux;
95
96
maintainers = [ maintainers.bjornfor ];
96
97
};
97
98
}
+9
-1
pkgs/development/tools/misc/sloccount/default.nix
+9
-1
pkgs/development/tools/misc/sloccount/default.nix
···
1
-
{ fetchurl, stdenv, perl }:
1
+
{ fetchurl, stdenv, perl, makeWrapper }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "sloccount-2.26";
···
8
8
sha256 = "0ayiwfjdh1946asah861ah9269s5xkc8p5fv1wnxs9znyaxs4zzs";
9
9
};
10
10
11
+
nativeBuildInputs = [ makeWrapper ];
11
12
buildInputs = [ perl ];
12
13
13
14
# Make sure the Flex-generated files are newer than the `.l' files, so that
···
39
40
mkdir -p "$out/share/man/man1"
40
41
mkdir -p "$out/share/doc"
41
42
'';
43
+
44
+
postInstall = ''
45
+
for w in "$out/bin"/*; do
46
+
isScript "$w" || continue
47
+
wrapProgram "$w" --prefix PATH : "$out/bin"
48
+
done
49
+
'';
42
50
43
51
meta = {
44
52
description = "Set of tools for counting physical Source Lines of Code (SLOC)";
+2
-2
pkgs/development/tools/packer/default.nix
+2
-2
pkgs/development/tools/packer/default.nix
···
1
1
{ stdenv, buildGoPackage, fetchFromGitHub }:
2
2
buildGoPackage rec {
3
3
name = "packer-${version}";
4
-
version = "1.3.3";
4
+
version = "1.4.0";
5
5
6
6
goPackagePath = "github.com/hashicorp/packer";
7
7
···
11
11
owner = "hashicorp";
12
12
repo = "packer";
13
13
rev = "v${version}";
14
-
sha256 = "1b1yp5k2apccyqw9zb2xclnm16gfnnkaiwh2s0p79prsy6gjkp7y";
14
+
sha256 = "0fpzmwh7vq8vc7gvlnpx4ji4yaxwi2h2ksz0z4782469pkcnbg56";
15
15
};
16
16
17
17
meta = with stdenv.lib; {
+25
pkgs/misc/vscode-extensions/default.nix
+25
pkgs/misc/vscode-extensions/default.nix
···
11
11
# "${mktplcRef.publisher}.${mktplcRef.name}".
12
12
#
13
13
rec {
14
+
15
+
alanz.vscode-hie-server = buildVscodeMarketplaceExtension {
16
+
mktplcRef = {
17
+
name = "vscode-hie-server";
18
+
publisher = "alanz";
19
+
version = "0.0.25"; # see the note above
20
+
sha256 = "0m21w03v94qxm0i54ki5slh6rg7610zfxinfpngr0hfpgw2nnxvc";
21
+
};
22
+
meta = {
23
+
license = stdenv.lib.licenses.mit;
24
+
};
25
+
};
26
+
14
27
bbenoist.Nix = buildVscodeMarketplaceExtension {
15
28
mktplcRef = {
16
29
name = "Nix";
···
20
33
};
21
34
meta = with stdenv.lib; {
22
35
license = licenses.mit;
36
+
};
37
+
};
38
+
39
+
justusadam.language-haskell = buildVscodeMarketplaceExtension {
40
+
mktplcRef = {
41
+
name = "language-haskell";
42
+
publisher = "justusadam";
43
+
version = "2.5.0"; # see the note above
44
+
sha256 = "10jqj8qw5x6da9l8zhjbra3xcbrwb4cpwc3ygsy29mam5pd8g6b3";
45
+
};
46
+
meta = {
47
+
license = stdenv.lib.licenses.bsd3;
23
48
};
24
49
};
25
50
+2
-1
pkgs/os-specific/linux/kbd/keymaps.nix
+2
-1
pkgs/os-specific/linux/kbd/keymaps.nix
···
24
24
25
25
src = fetchurl {
26
26
name = "neo.map";
27
-
url = "https://svn.neo-layout.org/linux/console/neo.map?r=${version}";
27
+
url = "https://raw.githubusercontent.com/neo-layout/neo-layout/"
28
+
+ "a0dee06fed824abfad658b7f10e6d907b270be0a/linux/console/neo.map";
28
29
sha256 = "19mfrd31vzpsjiwc7pshxm0b0sz5dd17xrz6k079cy4im1vf0r4g";
29
30
};
30
31
+9
pkgs/os-specific/linux/kernel/common-config.nix
+9
pkgs/os-specific/linux/kernel/common-config.nix
···
426
426
427
427
VFIO_PCI_VGA = mkIf stdenv.is64bit yes;
428
428
429
+
# VirtualBox guest drivers in the kernel conflict with the ones in the
430
+
# official additions package and prevent the vboxsf module from loading,
431
+
# so disable them for now.
432
+
VBOXGUEST = option no;
433
+
DRM_VBOXVIDEO = option no;
434
+
429
435
} // optionalAttrs (stdenv.isx86_64 || stdenv.isi686) ({
430
436
XEN = option yes;
431
437
···
693
699
# Bump the maximum number of CPUs to support systems like EC2 x1.*
694
700
# instances and Xeon Phi.
695
701
NR_CPUS = freeform "384";
702
+
} // optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") {
703
+
PREEMPT = no;
704
+
PREEMPT_VOLUNTARY = yes;
696
705
};
697
706
};
698
707
in
+2
-2
pkgs/os-specific/linux/kernel/linux-4.14.nix
+2
-2
pkgs/os-specific/linux/kernel/linux-4.14.nix
···
3
3
with stdenv.lib;
4
4
5
5
buildLinux (args // rec {
6
-
version = "4.14.118";
6
+
version = "4.14.120";
7
7
8
8
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
9
9
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
···
13
13
14
14
src = fetchurl {
15
15
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
16
-
sha256 = "05csfas10b3kfj6pn72skxpk211y36bdzk5x63n6dbxrsjmp6zb8";
16
+
sha256 = "0k6bphnwwbgj06v8a4xafb23ysrvh8kg0imwhbvm6vsyyrnfif6x";
17
17
};
18
18
} // (args.argsOverride or {}))
+2
-2
pkgs/os-specific/linux/kernel/linux-4.19.nix
+2
-2
pkgs/os-specific/linux/kernel/linux-4.19.nix
···
3
3
with stdenv.lib;
4
4
5
5
buildLinux (args // rec {
6
-
version = "4.19.42";
6
+
version = "4.19.44";
7
7
8
8
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
9
9
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
···
13
13
14
14
src = fetchurl {
15
15
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
16
-
sha256 = "09ns4qskl2drg0p9fajy7nbh55anj0qxl7smca9rfxfm21hdf2gq";
16
+
sha256 = "125jlsy42qlprg6yhinsm87ir7x4iw2v2fd0myjihmkpjgll4xkh";
17
17
};
18
18
} // (args.argsOverride or {}))
+2
-2
pkgs/os-specific/linux/kernel/linux-4.4.nix
+2
-2
pkgs/os-specific/linux/kernel/linux-4.4.nix
···
1
1
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
2
2
3
3
buildLinux (args // rec {
4
-
version = "4.4.179";
4
+
version = "4.4.180";
5
5
extraMeta.branch = "4.4";
6
6
7
7
src = fetchurl {
8
8
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
9
-
sha256 = "1l979wmxridq9psjlhmgkax3bi769pvmmvdgf0j2y67gclkrssic";
9
+
sha256 = "0ykai953rpy9zkb4qxb63y6pwwbwlnvx69nhb797zfw1scbh4i8s";
10
10
};
11
11
} // (args.argsOverride or {}))
+2
-2
pkgs/os-specific/linux/kernel/linux-4.9.nix
+2
-2
pkgs/os-specific/linux/kernel/linux-4.9.nix
···
1
1
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
2
2
3
3
buildLinux (args // rec {
4
-
version = "4.9.175";
4
+
version = "4.9.177";
5
5
extraMeta.branch = "4.9";
6
6
7
7
src = fetchurl {
8
8
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
9
-
sha256 = "032h0zd3rxg34vyp642978pbx66gnx3sfv49qwvbzwlx3zwk916r";
9
+
sha256 = "1vl7g21538ndlygpjsbjnayi9f37zi8s2g37gcznany3phz1wfy7";
10
10
};
11
11
} // (args.argsOverride or {}))
+2
-2
pkgs/os-specific/linux/kernel/linux-5.0.nix
+2
-2
pkgs/os-specific/linux/kernel/linux-5.0.nix
···
3
3
with stdenv.lib;
4
4
5
5
buildLinux (args // rec {
6
-
version = "5.0.15";
6
+
version = "5.0.17";
7
7
8
8
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
9
9
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
···
13
13
14
14
src = fetchurl {
15
15
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16
-
sha256 = "01zb8lz1lxcff2j8yxzm0ayfazi07c2n7v1i3v8wbq8k9r2vhgjw";
16
+
sha256 = "0acng2xdpjagqabhirb85yj2z9h6yplgdiicvk2kyklsvjdh4dxb";
17
17
};
18
18
} // (args.argsOverride or {}))
+2
-2
pkgs/os-specific/linux/kernel/linux-5.1.nix
+2
-2
pkgs/os-specific/linux/kernel/linux-5.1.nix
···
3
3
with stdenv.lib;
4
4
5
5
buildLinux (args // rec {
6
-
version = "5.1.1";
6
+
version = "5.1.3";
7
7
8
8
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
9
9
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
···
13
13
14
14
src = fetchurl {
15
15
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16
-
sha256 = "1pcd0npnrjbc01rzmm58gh135w9nm5mf649asqlw50772qa9jkd0";
16
+
sha256 = "18malq2ps7v8c21xp8vaba9kvnnpnzg3wcsi46ci1rzqv893xxdh";
17
17
};
18
18
} // (args.argsOverride or {}))
+3
-3
pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
+3
-3
pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
···
1
1
{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:
2
2
3
3
buildLinux (args // rec {
4
-
version = "4.14.94-155";
4
+
version = "4.14.120-160";
5
5
6
6
# modDirVersion needs to be x.y.z.
7
-
modDirVersion = "4.14.94";
7
+
modDirVersion = "4.14.120";
8
8
9
9
# branchVersion needs to be x.y.
10
10
extraMeta.branch = "4.14";
···
13
13
owner = "hardkernel";
14
14
repo = "linux";
15
15
rev = version;
16
-
sha256 = "1jg4m17y5wkmfmw8y9y9nh14xzw6011gbzlckqabmbazcdpbmf9d";
16
+
sha256 = "0sb7k8kpbm4h98jsqjnjmj0ysp55n9cpczpw0jsg0x0sj9qp73nr";
17
17
};
18
18
19
19
defconfig = "odroidxu4_defconfig";
+2
-2
pkgs/os-specific/linux/microcode/intel.nix
+2
-2
pkgs/os-specific/linux/microcode/intel.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "microcode-intel";
5
-
version = "20190312";
5
+
version = "20190514";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "intel";
9
9
repo = "Intel-Linux-Processor-Microcode-Data-Files";
10
10
rev = "microcode-${version}";
11
-
sha256 = "0n381dai2mv9indsbbr4nfbmp4y4qhshgflr095fyvq5a8acw94m";
11
+
sha256 = "1xdxkmsnic191g7kljmrdcvg8vlwiwcrcxy9fnhpqsbsp6mjylv7";
12
12
};
13
13
14
14
nativeBuildInputs = [ iucode-tool libarchive ];
+2
-2
pkgs/servers/nextcloud/default.nix
+2
-2
pkgs/servers/nextcloud/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "nextcloud-${version}";
5
-
version = "15.0.7";
5
+
version = "15.0.8";
6
6
7
7
src = fetchurl {
8
8
url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
9
-
sha256 = "0jcxza0p1vc9dhf2mimvyy1j25nzv02srghdsp6108573yamhq9y";
9
+
sha256 = "1w7jwni3iv8ixh92v6iaw9nwshjd9wvvdkwkdpcyq6crlfgmk0mp";
10
10
};
11
11
12
12
installPhase = ''
+33
pkgs/servers/sql/postgresql/ext/pg_partman.nix
+33
pkgs/servers/sql/postgresql/ext/pg_partman.nix
···
1
+
{ stdenv, fetchFromGitHub, postgresql }:
2
+
3
+
stdenv.mkDerivation rec {
4
+
pname = "pg_partman";
5
+
version = "4.1.0";
6
+
7
+
buildInputs = [ postgresql ];
8
+
9
+
src = fetchFromGitHub {
10
+
owner = "pgpartman";
11
+
repo = pname;
12
+
rev = "refs/tags/v${version}";
13
+
sha256 = "0bzv92x492jcwzhal9x4vc3vszixscdpxc6yq5rrqld26dhmsp06";
14
+
};
15
+
16
+
installPhase = ''
17
+
mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653
18
+
mkdir -p $out/{lib,share/extension}
19
+
20
+
cp src/*.so $out/lib
21
+
cp updates/* $out/share/extension
22
+
cp -r sql/* $out/share/extension
23
+
cp *.control $out/share/extension
24
+
'';
25
+
26
+
meta = with stdenv.lib; {
27
+
description = "Partition management extension for PostgreSQL";
28
+
homepage = https://github.com/pgpartman/pg_partman;
29
+
maintainers = with maintainers; [ ggpeti ];
30
+
platforms = postgresql.meta.platforms;
31
+
license = licenses.postgresql;
32
+
};
33
+
}
+3
-1
pkgs/servers/sql/postgresql/packages.nix
+3
-1
pkgs/servers/sql/postgresql/packages.nix
+3
-3
pkgs/tools/filesystems/yandex-disk/default.nix
+3
-3
pkgs/tools/filesystems/yandex-disk/default.nix
···
4
4
p = if stdenv.is64bit then {
5
5
arch = "x86_64";
6
6
gcclib = "${stdenv.cc.cc.lib}/lib64";
7
-
sha256 = "1skbzmrcjbw00a3jnbl2llqwz3ahsgvq74mjav68s2hw1wjidvk6";
7
+
sha256 = "1hxsizk3hm1465wkxwdbbcffgi3r64y3r0zsfzsvhvnzx4y5dadm";
8
8
}
9
9
else {
10
10
arch = "i386";
11
11
gcclib = "${stdenv.cc.cc.lib}/lib";
12
-
sha256 = "09h71i3k9d24ki81jdwhnav63fqbc44glbx228s9g3cr4ap41jcx";
12
+
sha256 = "1s829q8gy9xgz0jm7w70aljqs2h49x402blqfr9zvn806aprmrm5";
13
13
};
14
14
in
15
15
stdenv.mkDerivation rec {
16
16
17
17
name = "yandex-disk-${version}";
18
-
version = "0.1.5.978";
18
+
version = "0.1.5.1010";
19
19
20
20
src = fetchurl {
21
21
url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm";
+37
-10
pkgs/tools/networking/openvpn/default.nix
+37
-10
pkgs/tools/networking/openvpn/default.nix
···
1
-
{ stdenv, fetchurl, iproute, lzo, openssl, pam, pkgconfig
2
-
, useSystemd ? stdenv.isLinux, systemd ? null
1
+
{ stdenv, fetchurl, fetchpatch, pkgconfig
2
+
, iproute, lzo, openssl, pam
3
+
, useSystemd ? stdenv.isLinux, systemd ? null, utillinux ? null
3
4
, pkcs11Support ? false, pkcs11helper ? null,
4
5
}:
5
6
···
8
9
9
10
with stdenv.lib;
10
11
11
-
stdenv.mkDerivation rec {
12
+
let
13
+
# There is some fairly brittle string substitutions going on to replace paths,
14
+
# so please verify this script in case you are upgrading it
15
+
update-resolved = fetchurl {
16
+
url = "https://raw.githubusercontent.com/jonathanio/update-systemd-resolved/v1.2.7/update-systemd-resolved";
17
+
sha256 = "12zfzh42apwbj7ks5kfxf3far7kaghlby4yapbhn00q8pbdlw7pq";
18
+
};
19
+
20
+
in stdenv.mkDerivation rec {
12
21
name = "openvpn-${version}";
13
-
version = "2.4.6";
22
+
version = "2.4.7";
14
23
15
24
src = fetchurl {
16
25
url = "https://swupdate.openvpn.net/community/releases/${name}.tar.xz";
17
-
sha256 = "09lck4wmkas3iyrzaspin9gn3wiclqb1m9sf8diy7j8wakx38r2g";
26
+
sha256 = "0j7na936isk9j8nsdrrbw7wmy09inmjqvsb8mw8az7k61xbm6bx4";
18
27
};
19
28
20
29
nativeBuildInputs = [ pkgconfig ];
30
+
21
31
buildInputs = [ lzo openssl ]
22
32
++ optionals stdenv.isLinux [ pam iproute ]
23
33
++ optional useSystemd systemd
24
34
++ optional pkcs11Support pkcs11helper;
25
35
36
+
patches = [
37
+
( fetchpatch {
38
+
url = "https://sources.debian.org/data/main/o/openvpn/2.4.7-1/debian/patches/fix-pkcs11-helper-hang.patch";
39
+
sha256 = "0c8jzbfsmb0mm9f7kkjxac1hk8q6igm267s687vx3mdqs1wys6bm";
40
+
})
41
+
];
42
+
26
43
configureFlags = optionals stdenv.isLinux [
27
44
"--enable-iproute2"
28
45
"IPROUTE=${iproute}/sbin/ip" ]
···
35
52
cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples
36
53
cp -r sample/sample-keys/ $out/share/doc/openvpn/examples
37
54
cp -r sample/sample-scripts/ $out/share/doc/openvpn/examples
55
+
56
+
${optionalString useSystemd ''
57
+
install -Dm755 ${update-resolved} $out/libexec/update-systemd-resolved
58
+
59
+
substituteInPlace $out/libexec/update-systemd-resolved \
60
+
--replace '/usr/bin/env bash' '${stdenv.shell} -e' \
61
+
--replace 'busctl call' '${getBin systemd}/bin/busctl call' \
62
+
--replace '(ip ' '(${getBin iproute}/bin/ip ' \
63
+
--replace 'logger ' '${getBin utillinux}/bin/logger '
64
+
''}
38
65
'';
39
66
40
67
enableParallelBuilding = true;
41
68
42
-
meta = {
69
+
meta = with stdenv.lib; {
43
70
description = "A robust and highly flexible tunneling application";
71
+
downloadPage = "https://openvpn.net/index.php/open-source/downloads.html";
44
72
homepage = https://openvpn.net/;
45
-
downloadPage = "https://openvpn.net/index.php/open-source/downloads.html";
46
-
license = stdenv.lib.licenses.gpl2;
47
-
maintainers = [ stdenv.lib.maintainers.viric ];
48
-
platforms = stdenv.lib.platforms.unix;
73
+
license = licenses.gpl2;
74
+
maintainers = with maintainers; [ viric ];
75
+
platforms = platforms.unix;
49
76
updateWalker = true;
50
77
};
51
78
}
+2
-2
pkgs/tools/security/spectre-meltdown-checker/default.nix
+2
-2
pkgs/tools/security/spectre-meltdown-checker/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "spectre-meltdown-checker-${version}";
5
-
version = "0.40";
5
+
version = "0.41";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "speed47";
9
9
repo = "spectre-meltdown-checker";
10
10
rev = "v${version}";
11
-
sha256 = "0lhykc2andl0611bbs9b5dzp7c753crppvir2i7aw6bgwis23gjs";
11
+
sha256 = "0byjp7ph7g9di9xlg1fvspgq995a3b2yajq7sc8qap46ywvqr899";
12
12
};
13
13
14
14
prePatch = ''