The default Python 3 interpreter is now CPython 3.7 instead of CPython
diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix
index d323a158a4df..84ffaf2266ea 100644
--- a/nixos/modules/security/apparmor.nix
+++ b/nixos/modules/security/apparmor.nix
@@ -29,11 +29,18 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.apparmor-utils ];
+ boot.kernelParams = [ "apparmor=1" "security=apparmor" ];
+
systemd.services.apparmor = let
paths = concatMapStrings (s: " -I ${s}/etc/apparmor.d")
([ pkgs.apparmor-profiles ] ++ cfg.packages);
in {
- wantedBy = [ "local-fs.target" ];
+ after = [ "local-fs.target" ];
+ before = [ "sysinit.target" ];
+ wantedBy = [ "multi-user.target" ];
+ unitConfig = {
+ DefaultDependencies = "no";
+ };
serviceConfig = {
Type = "oneshot";
RemainAfterExit = "yes";
diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix
index 07bd10963bab..614889c4d73c 100644
--- a/nixos/tests/hardened.nix
+++ b/nixos/tests/hardened.nix
@@ -30,6 +30,16 @@ import ./make-test.nix ({ pkgs, ...} : {
''
$machine->waitForUnit("multi-user.target");
+ subtest "apparmor-loaded", sub {
+ $machine->succeed("systemctl status apparmor.service");
+ };
+
+ # AppArmor securityfs
+ subtest "apparmor-securityfs", sub {
+ $machine->succeed("mountpoint -q /sys/kernel/security");
+ $machine->succeed("cat /sys/kernel/security/apparmor/profiles");
+ };
+
# Test loading out-of-tree modules
subtest "extra-module-packages", sub {
$machine->succeed("grep -Fq wireguard /proc/modules");
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 6185b7d228f8..30cc73f3c0b0 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchFromGitHub, python3, python3Packages, zbar, secp256k1 }:
let
- version = "3.3.5";
+ version = "3.3.6";
qdarkstyle = python3Packages.buildPythonPackage rec {
pname = "QDarkStyle";
@@ -18,7 +18,7 @@ let
owner = "spesmilo";
repo = "electrum";
rev = version;
- sha256 = "11rzzrv5xxqazcb7q1ig93d6cisqmd1x0jrgvfgzysbzvi51gg11";
+ sha256 = "0s8i6fn1jwk80d036n4c7csv4qnx2k15f6347kr4mllglcpa9hb3";
extraPostFetch = ''
mv $out ./all
@@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec {
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
- sha256 = "1csj0n96zlajnrs39wsazfj5lmy7v7n77cdz56lr8nkmchh6k9z1";
+ sha256 = "0am5ki3z0yvhrz16vp2jjy5fkxxqph0mj9qqpbw3kpql65shykwz";
};
postUnpack = ''
diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 0049e9aca755..bf29e05db1b8 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -57,7 +57,28 @@ stdenv.mkDerivation rec {
prePatch = ''
cp ${src}/leptonica_mod/{allheaders.h,dewarp2.c,leptwin.c} src/
'';
- patches = [];
+ patches = [
+ # stripped down copy of upstream commit b88c821f8d347bce0aea86d606c710303919f3d2
+ ./leptonica-CVE-2018-3836.patch
+ (fetchpatch {
+ # CVE-2018-7186
+ url = "https://github.com/DanBloomberg/leptonica/commit/"
+ + "ee301cb2029db8a6289c5295daa42bba7715e99a.patch";
+ sha256 = "0cgb7mvz2px1rg5i80wk1wxxjvzjga617d8q6j7qygkp7jm6495d";
+ })
+ (fetchpatch {
+ # CVE-2018-7247
+ url = "https://github.com/DanBloomberg/leptonica/commit/"
+ + "c1079bb8e77cdd426759e466729917ca37a3ed9f.patch";
+ sha256 = "1z4iac5gwqggh7aa8cvyp6nl9fwd1v7wif26caxc9y5qr3jj34qf";
+ })
+ (fetchpatch {
+ # CVE-2018-7440
+ url = "https://github.com/DanBloomberg/leptonica/commit/"
+ + "49ecb6c2dfd6ed5078c62f4a8eeff03e3beced3b.patch";
+ sha256 = "1hjmva98iaw9xj7prg7aimykyayikcwnk4hk0380007hqb35lqmy";
+ })
+ ];
});
tesseract_modded = tesseract4.override {
tesseractBase = tesseract4.tesseractBase.overrideAttrs (_: {
diff --git a/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch b/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch
new file mode 100644
index 000000000000..f1b4170fbaae
--- /dev/null
+++ b/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch
@@ -0,0 +1,95 @@
+--- a/src/allheaders.h
++++ b/src/allheaders.h
+@@ -2600,6 +2600,7 @@
+ LEPT_DLL extern char * stringReverse ( const char *src );
+ LEPT_DLL extern char * strtokSafe ( char *cstr, const char *seps, char **psaveptr );
+ LEPT_DLL extern l_int32 stringSplitOnToken ( char *cstr, const char *seps, char **phead, char **ptail );
++LEPT_DLL extern l_int32 stringCheckForChars ( const char *src, const char *chars, l_int32 *pfound );
+ LEPT_DLL extern char * stringRemoveChars ( const char *src, const char *remchars );
+ LEPT_DLL extern l_int32 stringFindSubstr ( const char *src, const char *sub, l_int32 *ploc );
+ LEPT_DLL extern char * stringReplaceSubstr ( const char *src, const char *sub1, const char *sub2, l_int32 *pfound, l_int32 *ploc );
+--- a/src/gplot.c
++++ b/src/gplot.c
+@@ -141,9 +141,10 @@
+ const char *xlabel,
+ const char *ylabel)
+ {
+-char *newroot;
+-char buf[L_BUF_SIZE];
+-GPLOT *gplot;
++char *newroot;
++char buf[L_BUF_SIZE];
++l_int32 badchar;
++GPLOT *gplot;
+
+ PROCNAME("gplotCreate");
+
+@@ -152,6 +153,9 @@
+ if (outformat != GPLOT_PNG && outformat != GPLOT_PS &&
+ outformat != GPLOT_EPS && outformat != GPLOT_LATEX)
+ return (GPLOT *)ERROR_PTR("outformat invalid", procName, NULL);
++ stringCheckForChars(rootname, "`;&|><\"?*", &badchar);
++ if (badchar) /* danger of command injection */
++ return (GPLOT *)ERROR_PTR("invalid rootname", procName, NULL);
+
+ if ((gplot = (GPLOT *)LEPT_CALLOC(1, sizeof(GPLOT))) == NULL)
+ return (GPLOT *)ERROR_PTR("gplot not made", procName, NULL);
+--- a/src/utils2.c
++++ b/src/utils2.c
+@@ -42,6 +42,7 @@
+ * l_int32 stringSplitOnToken()
+ *
+ * Find and replace string and array procs
++ * l_int32 stringCheckForChars()
+ * char *stringRemoveChars()
+ * l_int32 stringFindSubstr()
+ * char *stringReplaceSubstr()
+@@ -701,6 +702,48 @@
+ /*--------------------------------------------------------------------*
+ * Find and replace procs *
+ *--------------------------------------------------------------------*/
++/*!
++ * \brief stringCheckForChars()
++ *
++ * \param[in] src input string; can be of zero length
++ * \param[in] chars string of chars to be searched for in %src
++ * \param[out] pfound 1 if any characters are found; 0 otherwise
++ * \return 0 if OK, 1 on error
++ *
++ *
++ * Notes:
++ * (1) This can be used to sanitize an operation by checking for
++ * special characters that don't belong in a string.
++ *
++ */
++l_int32
++stringCheckForChars(const char *src,
++ const char *chars,
++ l_int32 *pfound)
++{
++char ch;
++l_int32 i, n;
++
++ PROCNAME("stringCheckForChars");
++
++ if (!pfound)
++ return ERROR_INT("&found not defined", procName, 1);
++ *pfound = FALSE;
++ if (!src || !chars)
++ return ERROR_INT("src and chars not both defined", procName, 1);
++
++ n = strlen(src);
++ for (i = 0; i < n; i++) {
++ ch = src[i];
++ if (strchr(chars, ch)) {
++ *pfound = TRUE;
++ break;
++ }
++ }
++ return 0;
++}
++
++
+ /*!
+ * \brief stringRemoveChars()
+ *
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index a8bdb7d5b2d8..0715a01a9512 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -100,11 +100,11 @@ let
flash = stdenv.mkDerivation rec {
name = "flashplayer-ppapi-${version}";
- version = "32.0.0.171";
+ version = "32.0.0.192";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
- sha256 = "1rqf1kidpf2jqf20dw3hscrapdpm2j751742i6xnvj9mp66nczyg";
+ sha256 = "14nydiqjvr7hc4dmn900p7j7rp6prwyaf6xnki2ssbq6h1ni2lg1";
stripRoot = false;
};
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 566ec6006aa1..0de95c7d6a94 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
- sha256 = "0vsvjhmrc2p8mf4rfp9bf9y4nqkbbi5v8008cdvr6c14zq35w7hy";
- sha256bin64 = "1zzmk08y2rhirm297a91bvq5q30vvxll8fzfp7z5cpqb6az80y2h";
- version = "74.0.3729.108";
+ sha256 = "01sw6ql4fr1zwbw4l4c3xgmd3jqil9lgmpmlhfyj9ga4kp2qlnim";
+ sha256bin64 = "0xwxb54l1ylrckxd36pkzcla34d5hbnhxz3gkrv4id530l6ms6jh";
+ version = "75.0.3770.27";
};
dev = {
- sha256 = "1wrg4r2q043i8i4vq9zn69yvnzjxzmxyn21k367909kci83hhi44";
- sha256bin64 = "1jv9wi4nddijjp9y0r77rxciqsd1rkd87ipvagyq5nzpxr6wdzsa";
- version = "75.0.3766.2";
+ sha256 = "0fq8sjyscz998ha4wnn4npr3bb4jslcjc1i7xgwz6bh4yhi1az4f";
+ sha256bin64 = "1yb6ff6bg662klki7dcrdaysmsnqrnlp8syxcvwl2rysswll3wyl";
+ version = "76.0.3788.1";
};
stable = {
- sha256 = "0vsvjhmrc2p8mf4rfp9bf9y4nqkbbi5v8008cdvr6c14zq35w7hy";
- sha256bin64 = "0zs3khzszppmjf5s4rs6fbmhgc9y0abj4q4q8j3hn6nisddi9q9c";
- version = "74.0.3729.108";
+ sha256 = "01ifjsss3nqr15xx2iqsiqgjq1xc07j7ljnapsb484m7dcfk3gnw";
+ sha256bin64 = "0zkv4x4vbra476c6wy4igp6k80r9ssb9632wsyrzjni9w3zk9qvy";
+ version = "74.0.3729.157";
};
}
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 417bdf60b128..cde919923d72 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -74,7 +74,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
- version = "32.0.0.171";
+ version = "32.0.0.192";
src = fetchurl {
url =
@@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
- "0dl2kxsn4wh3243qkwyq13ikbmz6ljg95a1v02cylz36kpfl51iv"
+ "0n5m70mz1fa5pgpz1ldqgn6bkr4in5qjn79kb85127wmg8fddbz7"
else
- "1v9imcyml55qlvp0cibi5r5kl0rcivzvmnqgw8ph3xjm1yrxw3fr"
+ "1q6pjmnw2h8k09va5x64ijmq0kmfb569rwcibwl0d8kylxi97b6v"
else
if arch == "x86_64" then
- "1f3nl4qkws16q2yw940vvb0zmmwxks1blm4ida65hlda6f9zfq3h"
+ "1h2ya3szq24dczv2izxy47kr2raiahxx7zvm49jlvlcp5cygxvjk"
else
- "0df9nbxyn4wl4ap333mgnnmy994xj7i5hz07sw83pszlz3pjkc0m";
+ "084bv0m9w1v2s4bf5rgan40l1fajwfam3njvgm47ffyg6s0kg1kh";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index cfee25bf3f80..19c7d93b9a65 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -50,7 +50,7 @@
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
- version = "32.0.0.171";
+ version = "32.0.0.192";
src = fetchurl {
url =
@@ -60,9 +60,9 @@ stdenv.mkDerivation rec {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
- "0z4fkqbq1s63lpzfkyxllwx2wpizbabr4zim1dn7n59ld75vjxq8"
+ "0j5rzamyajkiblalqkimx29bwm7yg9m4nj9z7z8hahcywpf81yqg"
else
- "0nvgcdmgvgbj6axrh0yzkk437bxwsaxl0mvfkcyyz1hxnq51dvvg";
+ "0qnz383aggm07hbvyrnqphwhd5wp9xbairf908nk4i6ad8wg1x3r";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix
index aef18abaedfb..c2f8ba1d55ec 100644
--- a/pkgs/applications/science/math/nasc/default.nix
+++ b/pkgs/applications/science/math/nasc/default.nix
@@ -2,47 +2,45 @@
, fetchFromGitHub
, pkgconfig
, gtk3
+, glib
, pantheon
-, gnome3
+, libsoup
, gtksourceview
, libgee
, cmake
, libqalculate
-, gobject-introspection
-, wrapGAppsHook }:
+, cln
+, wrapGAppsHook
+}:
stdenv.mkDerivation rec {
- name = "nasc-${version}";
- version = "0.5.1";
+ pname = "nasc";
+ version = "0.5.4";
src = fetchFromGitHub {
owner = "parnold-x";
- repo = "nasc";
+ repo = pname;
rev = version;
- sha256 = "13y5fnm7g3xgdxmdydlgly73nigh8maqbf9d6c9bpyzxkxq1csy5";
+ sha256 = "036v3dx8yasp19j88lflibqnpfi5d0nk7qkcnr80zn1lvawf4wgn";
};
- postPatch = ''
- # libqalculatenasc.so is not installed, and nasc fails to start
- substituteInPlace libqalculatenasc/CMakeLists.txt --replace SHARED STATIC
- '';
-
nativeBuildInputs = [
cmake
pantheon.vala
- gobject-introspection # for setup-hook
pkgconfig
wrapGAppsHook
];
buildInputs = [
- pantheon.elementary-icon-theme
+ cln
+ libsoup
+ gtk3
+ glib
gtksourceview
libgee
- gnome3.libsoup
- pantheon.granite
- gtk3
libqalculate
+ pantheon.elementary-icon-theme
+ pantheon.granite
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix
index 48c5032f2da2..4802d259fb23 100644
--- a/pkgs/applications/video/devede/default.nix
+++ b/pkgs/applications/video/devede/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor
-, gtk3, gettext, wrapGAppsHook, gdk_pixbuf }:
+, gtk3, gettext, wrapGAppsHook, gdk_pixbuf, gobject-introspection }:
let
inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3;
@@ -15,8 +15,18 @@ in buildPythonApplication rec {
sha256 = "0ncb8nykchrjlllbzfjpvirmfvfaps9qhilc56kvcw3nzqrnkx8q";
};
+ # Temporary fix
+ # See https://github.com/NixOS/nixpkgs/issues/61578
+ # and https://github.com/NixOS/nixpkgs/issues/56943
+ strictDeps = false;
+
nativeBuildInputs = [
gettext wrapGAppsHook
+
+ # Temporary fix
+ # See https://github.com/NixOS/nixpkgs/issues/61578
+ # and https://github.com/NixOS/nixpkgs/issues/56943
+ gobject-introspection
];
buildInputs = [
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index bbe514144a1a..2a8255c7a8bb 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -5,8 +5,12 @@
, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
, libxkbcommon, xcbutilxrm, hicolor-icon-theme
, asciidoctor
+, gtk3Support ? false, gtk3 ? null
}:
+# needed for beautiful.gtk to work
+assert gtk3Support -> gtk3 != null;
+
with luaPackages; stdenv.mkDerivation rec {
name = "awesome-${version}";
version = "4.3";
@@ -36,7 +40,8 @@ with luaPackages; stdenv.mkDerivation rec {
xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence
xorg.xcbutil xorg.xcbutilimage xorg.xcbutilkeysyms
xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon
- xcbutilxrm ];
+ xcbutilxrm ]
+ ++ stdenv.lib.optional gtk3Support gtk3;
#cmakeFlags = "-DGENERATE_MANPAGES=ON";
cmakeFlags = "-DOVERRIDE_VERSION=${version}";
@@ -48,7 +53,7 @@ with luaPackages; stdenv.mkDerivation rec {
LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;;";
postInstall = ''
- # Don't use wrapProgram or or the wrapper will duplicate the --search
+ # Don't use wrapProgram or the wrapper will duplicate the --search
# arguments every restart
mv "$out/bin/awesome" "$out/bin/.awesome-wrapped"
makeWrapper "$out/bin/.awesome-wrapped" "$out/bin/awesome" \
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index bac8504eeec9..30346689a0a6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "gnome-desktop-${version}";
- version = "3.30.2.1";
+ version = "3.30.2.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "07s95fpfl3kjq51yxbrx6q87w812pq6bl0xdn0zzyi6qvg33m00v";
+ sha256 = "02ksmq2h4jjvjalp5x6d6v36qnp1h66qxwv2gl7kbx7dxqcp6ys3";
};
enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
index 9be383220e6e..8aa7cff2d030 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
@@ -6,14 +6,14 @@
stdenv.mkDerivation rec {
pname = "mutter";
- version = "3.28.3";
+ version = "3.28.4";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
- rev = "4af8d9d4752a94612a98d619e65828f0070a7b0e"; # HEAD of https://gitlab.gnome.org/GNOME/mutter/tree/gnome-3-28
- sha256 = "1rmc1bf80yq776xhygi1jzgia1y44j2mr2n94vlxgzqc0whamx2v";
+ rev = version;
+ sha256 = "0p8ky306dnm4alkncmsnd8r2awpsi37p0bzvkv313pgqw2hbwq9i";
};
patches = [
diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
index e5c8b6ea48f2..b85c2a8f7697 100644
--- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
pname = "photos";
- version = "2.6.3";
+ version = "2.6.4";
name = "elementary-${pname}-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1s0ww5g26wj0gd1drj8gxs74gvg2c9fdj4ixpifj8jh8yafdmrvg";
+ sha256 = "17r9658s0pqy6s45ysi3915sm8hpvmsp7cw2jahqvjc61r4qpdc1";
};
passthru = {
@@ -66,12 +66,6 @@ stdenv.mkDerivation rec {
"-Dplugins=false"
];
- patches = [
- # https://github.com/elementary/photos/pull/505
- # Unrelated line got dropped in https://github.com/elementary/photos/pull/498
- ./fix-missing-line.patch
- ];
-
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch b/pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch
deleted file mode 100644
index ae859d9dff92..000000000000
--- a/pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 88ee69b57f94efa2779595d1544109fed6a3211c Mon Sep 17 00:00:00 2001
-From: Fabio Valentini
-Date: Tue, 16 Apr 2019 16:12:47 +0200
-Subject: [PATCH] photos/PhotoMetadata: fix issue introduced with PR #498
-
----
- src/photos/PhotoMetadata.vala | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala
-index f0a4a73b..34dcbb55 100644
---- a/src/photos/PhotoMetadata.vala
-+++ b/src/photos/PhotoMetadata.vala
-@@ -197,6 +197,7 @@ public class PhotoMetadata : MediaMetadata {
- #else
- exiv2.from_app1_segment (buffer, length);
- #endif
-+ exif = Exif.Data.new_from_data (buffer, length);
- source_name = "".printf (length);
- }
-
diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index ba14621e8bdd..bc29dba9718e 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "gala";
- version = "unstable-2019-02-09"; # Is tracking https://github.com/elementary/gala/commits/stable/juno
+ version = "unstable-2019-05-14"; # Is tracking https://github.com/elementary/gala/commits/stable/juno
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
- rev = "1a96644c6aac405927499dacb308dea13512e919";
- sha256 = "1zi7xyzhsypf52zzfwf7dwcxgd0skxbsssv1vsxgmswszg23p7i3";
+ rev = "3ae100da4bbd9dabe353f468778ef63ef2dcd5d7";
+ sha256 = "08xcj4z9mq511w8hdpr60nmd6j1cj7rs7rgs4s5ivyg11kg5w17b";
};
passthru = {
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
index 2461ea4875ec..e905ce9d854b 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, pantheon, substituteAll, cmake, ninja
+{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, python3
, pkgconfig, vala, granite, libgee, gettext, gtk3, appstream, gnome-menus
, json-glib, plank, bamf, switchboard, libunity, libsoup, wingpanel, libwnck3
-, zeitgeist, gobject-introspection, elementary-icon-theme, bc, wrapGAppsHook }:
+, zeitgeist, bc }:
stdenv.mkDerivation rec {
pname = "applications-menu";
- version = "2.4.2";
+ version = "2.4.3";
name = "wingpanel-${pname}-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0y7kh50ixvm4m56v18c70s05hhpfp683c4qi3sxy50p2368d772x";
+ sha256 = "15mwfynaa57jii43x77iaz5gqjlylh5zxc70am8zgp8vhgzflvyd";
};
passthru = {
@@ -25,18 +25,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
appstream
- cmake
- ninja
gettext
- gobject-introspection
+ meson
+ ninja
pkgconfig
+ python3
vala
- wrapGAppsHook
];
buildInputs = [
bamf
- elementary-icon-theme
gnome-menus
granite
gtk3
@@ -51,6 +49,10 @@ stdenv.mkDerivation rec {
zeitgeist
];
+ mesonFlags = [
+ "--sysconfdir=${placeholder ''out''}/etc"
+ ];
+
PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
@@ -59,9 +61,13 @@ stdenv.mkDerivation rec {
src = ./bc.patch;
exec = "${bc}/bin/bc";
})
- ./xdg.patch
];
+ postPatch = ''
+ chmod +x meson/post_install.py
+ patchShebangs meson/post_install.py
+ '';
+
meta = with stdenv.lib; {
description = "Lightweight and stylish app launcher for Pantheon";
homepage = https://github.com/elementary/applications-menu;
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch
deleted file mode 100644
index f17e2581e07e..000000000000
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 928976a..7f0ea58 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -90,7 +90,7 @@ link_directories (${DEPS_LIBRARY_DIRS})
-
- # Installation
- install (TARGETS ${APPNAME} RUNTIME DESTINATION bin)
--install (FILES ${applications_menu} DESTINATION /etc/xdg/menus)
-+install (FILES ${applications_menu} DESTINATION etc/xdg/menus)
- file (GLOB resources "${CMAKE_CURRENT_SOURCE_DIR}/data/*")
-
- # Settings schema
diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix
index 54108e1a007b..ce43ed734324 100644
--- a/pkgs/development/libraries/libsass/default.nix
+++ b/pkgs/development/libraries/libsass/default.nix
@@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
sha256 = "0w6v1xa00jvfyk4b29ir7dfkhiq72anz015gg580bi7x3n7saz28";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2018-19827.patch";
+ url = "https://github.com/sass/libsass/commit/b21fb9f84096d9927780b86fa90629a096af358d.patch";
+ sha256 = "0ix12x9plmpgs3xda2fjdcykca687h16qfwqr57i5qphjr9vp33l";
+ })
+ ];
+
preConfigure = ''
export LIBSASS_VERSION=${version}
'';
diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix
index fbe48803f2db..e66bb6fe2118 100644
--- a/pkgs/development/misc/stm32/betaflight/default.nix
+++ b/pkgs/development/misc/stm32/betaflight/default.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev.
sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex
- substitutateInPlace Makefile \
+ substituteInPlace Makefile \
--replace "--specs=nano.specs" ""
'';
diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix
index 102b1eb8048d..683883ddbce9 100644
--- a/pkgs/development/misc/stm32/inav/default.nix
+++ b/pkgs/development/misc/stm32/inav/default.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
sed -ri "s/-j *[0-9]+//" Makefile # Eliminate parallel build args in submakes
sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex
- substitutateInPlace Makefile \
+ substituteInPlace Makefile \
--replace "--specs=nano.specs" ""
'';
diff --git a/pkgs/development/python-modules/rednose/default.nix b/pkgs/development/python-modules/rednose/default.nix
index 8257ca87dd99..fa142cf87236 100644
--- a/pkgs/development/python-modules/rednose/default.nix
+++ b/pkgs/development/python-modules/rednose/default.nix
@@ -13,9 +13,9 @@ buildPythonPackage rec {
substituteInPlace setup.py --replace "six==1.10.0" "six>=1.10.0"
'';
- # Do not test on Python 2 darwin because the tests suite gets stuck
- # https://github.com/JBKahn/rednose/issues/23
- doCheck = !(stdenv.isDarwin && isPy27);
+ # Do not test on Python 2 because the tests suite gets stuck
+ # https://github.com/NixOS/nixpkgs/issues/60786
+ doCheck = !(isPy27);
checkInputs = [ six ];
propagatedBuildInputs = [ nose colorama termstyle ];
diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix
index 18ffc238f0d1..19e4423f7d86 100644
--- a/pkgs/development/tools/misc/saleae-logic/default.nix
+++ b/pkgs/development/tools/misc/saleae-logic/default.nix
@@ -9,7 +9,7 @@
{ stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft
, fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor
, freetype, libXinerama, libxcb, zlib, pciutils
-, makeDesktopItem, xkeyboardconfig, runtimeShell
+, makeDesktopItem, xkeyboardconfig, dbus, runtimeShell, libGL
}:
let
@@ -17,30 +17,23 @@ let
libPath = stdenv.lib.makeLibraryPath [
glib libSM libICE gtk2 libXext libXft fontconfig libXrender libXfixes libX11
libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc.lib
+ dbus libGL
];
in
+assert stdenv.hostPlatform.system == "x86_64-linux";
+
stdenv.mkDerivation rec {
pname = "saleae-logic";
- version = "1.2.10";
+ version = "1.2.18";
name = "${pname}-${version}";
- src =
- if stdenv.hostPlatform.system == "i686-linux" then
- fetchurl {
- name = "saleae-logic-${version}-32bit.zip";
- url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(32-bit).zip";
- sha256 = "1dyrj07cgj2fvwi1sk97vady9ri8f8n7mxy9zyzmw9isngs7bmll";
- }
- else if stdenv.hostPlatform.system == "x86_64-linux" then
- fetchurl {
- name = "saleae-logic-${version}-64bit.zip";
- url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip";
- sha256 = "1skx2pfnic7pyss7c69qb7kg2xvflpxf112xkf9awk516dw1w4h7";
- }
- else
- throw "Saleae Logic software requires i686-linux or x86_64-linux";
+ src = fetchurl {
+ name = "saleae-logic-${version}-64bit.zip";
+ url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip";
+ sha256 = "0lhair2vsg8sjvzicvfcjfmvy30q7i01xj4z02iqh7pgzpb025h8";
+ };
desktopItem = makeDesktopItem {
name = "saleae-logic";
@@ -61,7 +54,15 @@ stdenv.mkDerivation rec {
# Patch it
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/Logic"
- patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$out/Logic"
+ for bin in "$out/Logic" \
+ "$out/libQt5Widgets.so.5" \
+ "$out/libQt5Gui.so.5" \
+ "$out/libQt5Core.so.5" \
+ "$out/libQt5Network.so.5" ; do
+ patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/Analyzers:\$ORIGIN" "$bin"
+ done
+
+ patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64:${libPath}:\$ORIGIN/../" "$out/platforms/libqxcb.so"
# Build the LD_PRELOAD library that makes Logic work from a read-only directory
mkdir -p "$out/lib"
@@ -91,7 +92,7 @@ stdenv.mkDerivation rec {
description = "Software for Saleae logic analyzers";
homepage = http://www.saleae.com/;
license = licenses.unfree;
- platforms = [ "x86_64-linux" "i686-linux" ];
+ platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
};
}
diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix
index 28500ee08eee..965f0ed096cd 100644
--- a/pkgs/development/tools/misc/sloccount/default.nix
+++ b/pkgs/development/tools/misc/sloccount/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, perl }:
+{ fetchurl, stdenv, perl, makeWrapper }:
stdenv.mkDerivation rec {
name = "sloccount-2.26";
@@ -8,6 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0ayiwfjdh1946asah861ah9269s5xkc8p5fv1wnxs9znyaxs4zzs";
};
+ nativeBuildInputs = [ makeWrapper ];
buildInputs = [ perl ];
# Make sure the Flex-generated files are newer than the `.l' files, so that
@@ -40,6 +41,13 @@ stdenv.mkDerivation rec {
mkdir -p "$out/share/doc"
'';
+ postInstall = ''
+ for w in "$out/bin"/*; do
+ isScript "$w" || continue
+ wrapProgram "$w" --prefix PATH : "$out/bin"
+ done
+ '';
+
meta = {
description = "Set of tools for counting physical Source Lines of Code (SLOC)";
diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index 5e54a8b37058..162ac045a9de 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "packer-${version}";
- version = "1.3.3";
+ version = "1.4.0";
goPackagePath = "github.com/hashicorp/packer";
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "hashicorp";
repo = "packer";
rev = "v${version}";
- sha256 = "1b1yp5k2apccyqw9zb2xclnm16gfnnkaiwh2s0p79prsy6gjkp7y";
+ sha256 = "0fpzmwh7vq8vc7gvlnpx4ji4yaxwi2h2ksz0z4782469pkcnbg56";
};
meta = with stdenv.lib; {
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 59938b76fe0b..9117364b8205 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -11,6 +11,19 @@ in
# "${mktplcRef.publisher}.${mktplcRef.name}".
#
rec {
+
+ alanz.vscode-hie-server = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "vscode-hie-server";
+ publisher = "alanz";
+ version = "0.0.25"; # see the note above
+ sha256 = "0m21w03v94qxm0i54ki5slh6rg7610zfxinfpngr0hfpgw2nnxvc";
+ };
+ meta = {
+ license = stdenv.lib.licenses.mit;
+ };
+ };
+
bbenoist.Nix = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "Nix";
@@ -23,6 +36,18 @@ rec {
};
};
+ justusadam.language-haskell = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "language-haskell";
+ publisher = "justusadam";
+ version = "2.5.0"; # see the note above
+ sha256 = "10jqj8qw5x6da9l8zhjbra3xcbrwb4cpwc3ygsy29mam5pd8g6b3";
+ };
+ meta = {
+ license = stdenv.lib.licenses.bsd3;
+ };
+ };
+
ms-vscode.cpptools = callPackage ./cpptools {};
ms-python.python = callPackage ./python {};
diff --git a/pkgs/os-specific/linux/kbd/keymaps.nix b/pkgs/os-specific/linux/kbd/keymaps.nix
index ecb7045ed278..32c9f6906806 100644
--- a/pkgs/os-specific/linux/kbd/keymaps.nix
+++ b/pkgs/os-specific/linux/kbd/keymaps.nix
@@ -24,7 +24,8 @@
src = fetchurl {
name = "neo.map";
- url = "https://svn.neo-layout.org/linux/console/neo.map?r=${version}";
+ url = "https://raw.githubusercontent.com/neo-layout/neo-layout/"
+ + "a0dee06fed824abfad658b7f10e6d907b270be0a/linux/console/neo.map";
sha256 = "19mfrd31vzpsjiwc7pshxm0b0sz5dd17xrz6k079cy4im1vf0r4g";
};
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index ea73a4251f0d..65f0ab24480e 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -426,6 +426,12 @@ let
VFIO_PCI_VGA = mkIf stdenv.is64bit yes;
+ # VirtualBox guest drivers in the kernel conflict with the ones in the
+ # official additions package and prevent the vboxsf module from loading,
+ # so disable them for now.
+ VBOXGUEST = option no;
+ DRM_VBOXVIDEO = option no;
+
} // optionalAttrs (stdenv.isx86_64 || stdenv.isi686) ({
XEN = option yes;
@@ -693,6 +699,9 @@ let
# Bump the maximum number of CPUs to support systems like EC2 x1.*
# instances and Xeon Phi.
NR_CPUS = freeform "384";
+ } // optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") {
+ PREEMPT = no;
+ PREEMPT_VOLUNTARY = yes;
};
};
in
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 8cf9fa199d9e..c10b2b8a6d4a 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.14.118";
+ version = "4.14.120";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "05csfas10b3kfj6pn72skxpk211y36bdzk5x63n6dbxrsjmp6zb8";
+ sha256 = "0k6bphnwwbgj06v8a4xafb23ysrvh8kg0imwhbvm6vsyyrnfif6x";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 08009fe8799e..bd5f2fe347d1 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.19.42";
+ version = "4.19.44";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "09ns4qskl2drg0p9fajy7nbh55anj0qxl7smca9rfxfm21hdf2gq";
+ sha256 = "125jlsy42qlprg6yhinsm87ir7x4iw2v2fd0myjihmkpjgll4xkh";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 7ffe5dc88f11..dc6998410cfb 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.4.179";
+ version = "4.4.180";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1l979wmxridq9psjlhmgkax3bi769pvmmvdgf0j2y67gclkrssic";
+ sha256 = "0ykai953rpy9zkb4qxb63y6pwwbwlnvx69nhb797zfw1scbh4i8s";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index d6afc0f54d34..ca30427a8833 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.175";
+ version = "4.9.177";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "032h0zd3rxg34vyp642978pbx66gnx3sfv49qwvbzwlx3zwk916r";
+ sha256 = "1vl7g21538ndlygpjsbjnayi9f37zi8s2g37gcznany3phz1wfy7";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.0.nix b/pkgs/os-specific/linux/kernel/linux-5.0.nix
index d48b4da3371d..28ea81e8795b 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.0.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.0.15";
+ version = "5.0.17";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "01zb8lz1lxcff2j8yxzm0ayfazi07c2n7v1i3v8wbq8k9r2vhgjw";
+ sha256 = "0acng2xdpjagqabhirb85yj2z9h6yplgdiicvk2kyklsvjdh4dxb";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix
index 235848bb8763..5db24b34ec9d 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.1.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.1.1";
+ version = "5.1.3";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1pcd0npnrjbc01rzmm58gh135w9nm5mf649asqlw50772qa9jkd0";
+ sha256 = "18malq2ps7v8c21xp8vaba9kvnnpnzg3wcsi46ci1rzqv893xxdh";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
index 6bc692385912..df741d9a029b 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
@@ -1,10 +1,10 @@
{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:
buildLinux (args // rec {
- version = "4.14.94-155";
+ version = "4.14.120-160";
# modDirVersion needs to be x.y.z.
- modDirVersion = "4.14.94";
+ modDirVersion = "4.14.120";
# branchVersion needs to be x.y.
extraMeta.branch = "4.14";
@@ -13,7 +13,7 @@ buildLinux (args // rec {
owner = "hardkernel";
repo = "linux";
rev = version;
- sha256 = "1jg4m17y5wkmfmw8y9y9nh14xzw6011gbzlckqabmbazcdpbmf9d";
+ sha256 = "0sb7k8kpbm4h98jsqjnjmj0ysp55n9cpczpw0jsg0x0sj9qp73nr";
};
defconfig = "odroidxu4_defconfig";
diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index 2af0e60b9c1a..080fc0d3d47a 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "microcode-intel";
- version = "20190312";
+ version = "20190514";
src = fetchFromGitHub {
owner = "intel";
repo = "Intel-Linux-Processor-Microcode-Data-Files";
rev = "microcode-${version}";
- sha256 = "0n381dai2mv9indsbbr4nfbmp4y4qhshgflr095fyvq5a8acw94m";
+ sha256 = "1xdxkmsnic191g7kljmrdcvg8vlwiwcrcxy9fnhpqsbsp6mjylv7";
};
nativeBuildInputs = [ iucode-tool libarchive ];
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 3e3bd8a46532..b62ddbf7b29a 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "nextcloud-${version}";
- version = "15.0.7";
+ version = "15.0.8";
src = fetchurl {
url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
- sha256 = "0jcxza0p1vc9dhf2mimvyy1j25nzv02srghdsp6108573yamhq9y";
+ sha256 = "1w7jwni3iv8ixh92v6iaw9nwshjd9wvvdkwkdpcyq6crlfgmk0mp";
};
installPhase = ''
diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
new file mode 100644
index 000000000000..b8ca074f6627
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, postgresql }:
+
+stdenv.mkDerivation rec {
+ pname = "pg_partman";
+ version = "4.1.0";
+
+ buildInputs = [ postgresql ];
+
+ src = fetchFromGitHub {
+ owner = "pgpartman";
+ repo = pname;
+ rev = "refs/tags/v${version}";
+ sha256 = "0bzv92x492jcwzhal9x4vc3vszixscdpxc6yq5rrqld26dhmsp06";
+ };
+
+ installPhase = ''
+ mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653
+ mkdir -p $out/{lib,share/extension}
+
+ cp src/*.so $out/lib
+ cp updates/* $out/share/extension
+ cp -r sql/* $out/share/extension
+ cp *.control $out/share/extension
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Partition management extension for PostgreSQL";
+ homepage = https://github.com/pgpartman/pg_partman;
+ maintainers = with maintainers; [ ggpeti ];
+ platforms = postgresql.meta.platforms;
+ license = licenses.postgresql;
+ };
+}
diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix
index a1ca71d2c8cf..94b71a20abff 100644
--- a/pkgs/servers/sql/postgresql/packages.nix
+++ b/pkgs/servers/sql/postgresql/packages.nix
@@ -34,4 +34,6 @@ self: super: {
timescaledb = super.callPackage ./ext/timescaledb.nix { };
tsearch_extras = super.callPackage ./ext/tsearch_extras.nix { };
-}
\ No newline at end of file
+
+ pg_partman = super.callPackage ./ext/pg_partman.nix { };
+}
diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index 6acb034d75b6..3b9e4a021080 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -4,18 +4,18 @@ let
p = if stdenv.is64bit then {
arch = "x86_64";
gcclib = "${stdenv.cc.cc.lib}/lib64";
- sha256 = "1skbzmrcjbw00a3jnbl2llqwz3ahsgvq74mjav68s2hw1wjidvk6";
+ sha256 = "1hxsizk3hm1465wkxwdbbcffgi3r64y3r0zsfzsvhvnzx4y5dadm";
}
else {
arch = "i386";
gcclib = "${stdenv.cc.cc.lib}/lib";
- sha256 = "09h71i3k9d24ki81jdwhnav63fqbc44glbx228s9g3cr4ap41jcx";
+ sha256 = "1s829q8gy9xgz0jm7w70aljqs2h49x402blqfr9zvn806aprmrm5";
};
in
stdenv.mkDerivation rec {
name = "yandex-disk-${version}";
- version = "0.1.5.978";
+ version = "0.1.5.1010";
src = fetchurl {
url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm";
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 358c53f453bb..732687ecfa15 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, iproute, lzo, openssl, pam, pkgconfig
-, useSystemd ? stdenv.isLinux, systemd ? null
+{ stdenv, fetchurl, fetchpatch, pkgconfig
+, iproute, lzo, openssl, pam
+, useSystemd ? stdenv.isLinux, systemd ? null, utillinux ? null
, pkcs11Support ? false, pkcs11helper ? null,
}:
@@ -8,21 +9,37 @@ assert pkcs11Support -> (pkcs11helper != null);
with stdenv.lib;
-stdenv.mkDerivation rec {
+let
+ # There is some fairly brittle string substitutions going on to replace paths,
+ # so please verify this script in case you are upgrading it
+ update-resolved = fetchurl {
+ url = "https://raw.githubusercontent.com/jonathanio/update-systemd-resolved/v1.2.7/update-systemd-resolved";
+ sha256 = "12zfzh42apwbj7ks5kfxf3far7kaghlby4yapbhn00q8pbdlw7pq";
+ };
+
+in stdenv.mkDerivation rec {
name = "openvpn-${version}";
- version = "2.4.6";
+ version = "2.4.7";
src = fetchurl {
url = "https://swupdate.openvpn.net/community/releases/${name}.tar.xz";
- sha256 = "09lck4wmkas3iyrzaspin9gn3wiclqb1m9sf8diy7j8wakx38r2g";
+ sha256 = "0j7na936isk9j8nsdrrbw7wmy09inmjqvsb8mw8az7k61xbm6bx4";
};
nativeBuildInputs = [ pkgconfig ];
+
buildInputs = [ lzo openssl ]
++ optionals stdenv.isLinux [ pam iproute ]
++ optional useSystemd systemd
++ optional pkcs11Support pkcs11helper;
+ patches = [
+ ( fetchpatch {
+ url = "https://sources.debian.org/data/main/o/openvpn/2.4.7-1/debian/patches/fix-pkcs11-helper-hang.patch";
+ sha256 = "0c8jzbfsmb0mm9f7kkjxac1hk8q6igm267s687vx3mdqs1wys6bm";
+ })
+ ];
+
configureFlags = optionals stdenv.isLinux [
"--enable-iproute2"
"IPROUTE=${iproute}/sbin/ip" ]
@@ -35,17 +52,27 @@ stdenv.mkDerivation rec {
cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples
cp -r sample/sample-keys/ $out/share/doc/openvpn/examples
cp -r sample/sample-scripts/ $out/share/doc/openvpn/examples
+
+ ${optionalString useSystemd ''
+ install -Dm755 ${update-resolved} $out/libexec/update-systemd-resolved
+
+ substituteInPlace $out/libexec/update-systemd-resolved \
+ --replace '/usr/bin/env bash' '${stdenv.shell} -e' \
+ --replace 'busctl call' '${getBin systemd}/bin/busctl call' \
+ --replace '(ip ' '(${getBin iproute}/bin/ip ' \
+ --replace 'logger ' '${getBin utillinux}/bin/logger '
+ ''}
'';
enableParallelBuilding = true;
- meta = {
+ meta = with stdenv.lib; {
description = "A robust and highly flexible tunneling application";
- homepage = https://openvpn.net/;
downloadPage = "https://openvpn.net/index.php/open-source/downloads.html";
- license = stdenv.lib.licenses.gpl2;
- maintainers = [ stdenv.lib.maintainers.viric ];
- platforms = stdenv.lib.platforms.unix;
+ homepage = https://openvpn.net/;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ viric ];
+ platforms = platforms.unix;
updateWalker = true;
};
}
diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix
index 256423892c48..a3e6468c4fee 100644
--- a/pkgs/tools/security/spectre-meltdown-checker/default.nix
+++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "spectre-meltdown-checker-${version}";
- version = "0.40";
+ version = "0.41";
src = fetchFromGitHub {
owner = "speed47";
repo = "spectre-meltdown-checker";
rev = "v${version}";
- sha256 = "0lhykc2andl0611bbs9b5dzp7c753crppvir2i7aw6bgwis23gjs";
+ sha256 = "0byjp7ph7g9di9xlg1fvspgq995a3b2yajq7sc8qap46ywvqr899";
};
prePatch = ''