From 9836a245c76855bf2bdacece8063df3eeaf0bd72 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 29 Dec 2018 20:28:32 +0100 Subject: [PATCH 1/9] add myself to maintainers list (cherry picked from commit 4fb9712a83656f0d6d35260052734f155131df8d) --- maintainers/maintainer-list.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3529ed744f11..f8521c1f6935 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3636,6 +3636,10 @@ github = "fkz"; name = "Fabian Schmitthenner"; }; + schmittlauch = { + email = "t.schmittlauch+nixos@orlives.de"; + github = "schmittlauch"; + }; schneefux = { email = "schneefux+nixos_pkg@schneefux.xyz"; github = "schneefux"; From 7abe13c207b505427d754eb35ac5f4baed0995bd Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 30 Dec 2018 03:12:43 +0100 Subject: [PATCH 2/9] kcharselect: init at 18.08.0 Packaging `kcharselect` because a KDE tool for inserting special characters is very useful. (cherry picked from commit ec0eaca0f4453ddcd20684cafd5abf6fb21a84d1) --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kcharselect.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++--- 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/kde/kcharselect.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 072b66e55638..2420b0914e43 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -93,6 +93,7 @@ let kcalc = callPackage ./kcalc.nix {}; kcalcore = callPackage ./kcalcore.nix {}; kcalutils = callPackage ./kcalutils.nix {}; + kcharselect = callPackage ./kcharselect.nix {}; kcolorchooser = callPackage ./kcolorchooser.nix {}; kcontacts = callPackage ./kcontacts.nix {}; kdav = callPackage ./kdav.nix {}; diff --git a/pkgs/applications/kde/kcharselect.nix b/pkgs/applications/kde/kcharselect.nix new file mode 100644 index 000000000000..4af712b1d5a5 --- /dev/null +++ b/pkgs/applications/kde/kcharselect.nix @@ -0,0 +1,19 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + kbookmarks, kconfig, kconfigwidgets, kcrash, kcoreaddons, ki18n, kwidgetsaddons, kxmlgui +}: + +mkDerivation { + name = "kcharselect"; + meta = { + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.schmittlauch ]; + description = "A tool to select special characters from all installed fonts and copy them into the clipboard"; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kbookmarks kconfig kconfigwidgets kcoreaddons kcrash ki18n kwidgetsaddons kxmlgui + ]; + enableParallelBuilding = true; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6586b2d4fbdd..403c64ffdc46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17232,9 +17232,9 @@ with pkgs; inherit (kdeApplications) akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b - kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kdialog keditbookmarks - kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole kpkpass kitinerary - kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okular spectacle; + kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kcontacts kdenlive kdf kdialog + keditbookmarks kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole + kpkpass kitinerary kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okular spectacle; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; From 1e4a763013afb06ec8a897fd70e2931ca7977a37 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 12 Jan 2019 12:52:16 +0100 Subject: [PATCH 3/9] irssi: 1.1.1 -> 1.1.2 Fixes CVE-2019-5882 [1] and a few minor changes [2]. [1] https://irssi.org/security/html/irssi_sa_2019_01/ [2] https://irssi.org/2019/01/09/irssi-1.1.2-released/ (cherry picked from commit 41ee7073dff052be731afa12d2b80a690b3d212c) --- pkgs/applications/networking/irc/irssi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index ff80df6523cb..7802a898d4c7 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl }: stdenv.mkDerivation rec { - version = "1.1.1"; + version = "1.1.2"; name = "irssi-${version}"; src = fetchurl { url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz"; - sha256 = "09a9p1yfg0m3w7n2a4axvn8874002ly8x0b543sxihzqk29radpa"; + sha256 = "0jbhd4aad3bn61svnb2rwa4dwj8qyrb2dmzribi2hfn1f719wzfv"; }; nativeBuildInputs = [ pkgconfig ]; From cffe29fcc7cee092059f0d16ab1379603450c73a Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Fri, 11 Jan 2019 20:02:00 -0500 Subject: [PATCH 4/9] vscode: 1.30.1 -> 1.30.2 (cherry picked from commit 6b80db3f5fae2e72f7a06943abe3cfae2791e8e8) --- pkgs/applications/editors/vscode/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 167a8fe7b706..b38b357126fa 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -12,9 +12,9 @@ let }.${stdenv.hostPlatform.system}; sha256 = { - "i686-linux" = "1xadkgqfwsl53blm2f0kdvczwmag47585dswa1hpafzc8i86009b"; - "x86_64-linux" = "0h77kc6z9c5bkkb8svjxjabnbbv0lb835kzd1c2yypamkhag9j4a"; - "x86_64-darwin" = "1f8grgav5capd2mm1nx0416na8c6qjh91680cfvf1jh4pjihs6g4"; + "i686-linux" = "1g73fay6fxlqhalkqq5m6rjbp68k9npk0rrxrkhdj8mw0cz74dpm"; + "x86_64-linux" = "0mil8n5i2ajdyrgq862wq59ajy2122rvvn7m7mxq4ab92sk26rix"; + "x86_64-darwin" = "07r52scs1sgafzxqal39r8vf9p9qqvwwx8f6z09gqcf6clr6k48q"; }.${stdenv.hostPlatform.system}; archive_fmt = if stdenv.hostPlatform.system == "x86_64-darwin" then "zip" else "tar.gz"; @@ -31,7 +31,7 @@ let in stdenv.mkDerivation rec { name = "vscode-${version}"; - version = "1.30.1"; + version = "1.30.2"; src = fetchurl { name = "VSCode_${version}_${plat}.${archive_fmt}"; From 2427f19b91d98e3de80b0043b776af501d0f63b2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 8 Jan 2019 21:00:22 -0600 Subject: [PATCH 5/9] tor: 0.3.4.9 -> 0.3.4.10 https://lists.torproject.org/pipermail/tor-announce/2019-January/000171.html FWIW, in the ChangeLog (in the source, sorry) it mentions: As a reminder, the Tor 0.3.4 series will be supported until 10 June 2019. Some time between now and then, users should switch to the Tor 0.3.5 series, which will receive long-term support until at least 1 Feb 2022. So we should consider moving to 0.3.5 "soon" :). (cherry picked from commit 91859c0504718d7734231e90cd8d605af9cde167) --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index d5e74f6636af..a08e6f7206a3 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -14,11 +14,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.3.4.9"; + name = "tor-0.3.4.10"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "0jhnvnp08hsfrzgsvg5xnfxyaw3nzgg9h24cwbwnz6iby20i05qs"; + sha256 = "12i51i6swkdpnbcpa6f1csc00q177sbjnw2x31j53glxshmwpv5d"; }; outputs = [ "out" "geoip" ]; From 4d5935de624d3abb1ee4f5f74722afe98cd28c96 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 11 Jan 2019 22:40:19 -0500 Subject: [PATCH 6/9] tests: Wait for shell for twice as long (10m) See #49441 for an earlier attempt, which was subsequently reverted. I am assuming that doubling the time will be sufficient if the machine is overloaded since so many of the tests already pass at 5 minutes, while still not holding back failures for needlessly long. (cherry picked from commit b28b37eb00768da86b9be8f4a61e3a46cdb604d6) --- nixos/lib/test-driver/Machine.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index a00fe25c2b8e..af076cf5ab0c 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -250,7 +250,7 @@ sub connect { $self->start; local $SIG{ALRM} = sub { die "timed out waiting for the VM to connect\n"; }; - alarm 300; + alarm 600; readline $self->{socket} or die "the VM quit before connecting\n"; alarm 0; From 3b7c070663b48a4ee37736e206e611bd2891cc27 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 12 Jan 2019 22:13:23 +0100 Subject: [PATCH 7/9] nextcloud: 15.0.0 -> 15.0.2 (cherry picked from commit 58af931a5754c684cc9a9540b9068a76c3753635) --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 0d9533b30f25..68f1374bbdc0 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.0"; + version = "15.0.2"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "0y7bk1588n5rmmranmmrkajh50074460hr4v052ahg9mf60wbc2v"; + sha256 = "1shgr81hhxr2k45hqlx06qhyayhbqdi0ndvpcyzdv54rwcrwrx61"; }; installPhase = '' From ab838cfffd187551d7706deceb566be6aae51ee9 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 3 Jan 2019 20:07:26 +0100 Subject: [PATCH 8/9] youtube-dl: 2018.12.17 -> 2019.01.02 (cherry picked from commit c74054f1d17edb686e157d140b115f7551031da3) --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index fbf925516f35..1505fa37ea89 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2018.12.17"; + version = "2019.01.02"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1nd4zr3wd35vldm775m9wcgbzma2013yyj134lcz19ipjs38isrk"; + sha256 = "0iw8cfzghhkx2q7m3rwnhm3xyyh88qd2553fb287shkxyg9kz96b"; }; nativeBuildInputs = [ makeWrapper ]; From 919e0ada69868e3fbaaa01e350b2ccaeafad525f Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 10 Jan 2019 20:36:35 +0100 Subject: [PATCH 9/9] youtube-dl: 2019.01.02 -> 2019.01.10 (cherry picked from commit 395dbf0d9a9894107b2c05c957662e9374ead287) --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 1505fa37ea89..6d6d20f59659 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.01.02"; + version = "2019.01.10"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0iw8cfzghhkx2q7m3rwnhm3xyyh88qd2553fb287shkxyg9kz96b"; + sha256 = "07r1y06697vhbkbf8pix4cnybaqmlf1wb2df5glj2xv8nl6f51gd"; }; nativeBuildInputs = [ makeWrapper ];