From bf437947b3ac030bab21422b7683c770f034b074 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Sat, 5 Sep 2020 14:57:33 -0700 Subject: [PATCH 01/42] nlohmann_json: 3.7.3 -> 3.9.1 --- pkgs/development/libraries/nlohmann_json/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index a4e76506a22..84b86b47157 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "nlohmann_json"; - version = "3.7.3"; + version = "3.9.1"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "04rry1xzis71z5gj1ylcj8b4li5q18zxhcwaviwvi3hx0frzxl9w"; + sha256 = "sha256-THordDPdH2qwk6lFTgeFmkl7iDuA/7YH71PTUe6vJCs="; }; nativeBuildInputs = [ cmake ]; From 6d15ea65f5b899225a58eaa4612326a8c279f20e Mon Sep 17 00:00:00 2001 From: David Birks Date: Thu, 22 Oct 2020 00:13:40 -0400 Subject: [PATCH 02/42] maintainers: add dbirks --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index eeb23378b6a..2f168194563 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2007,6 +2007,16 @@ githubId = 49904992; name = "Dawid Sowa"; }; + dbirks = { + email = "david@birks.dev"; + github = "dbirks"; + githubId = 7545665; + name = "David Birks"; + keys = [{ + longkeyid = "ed25519/0xBB999F83D9A19A36"; + fingerprint = "B26F 9AD8 DA20 3392 EF87 C61A BB99 9F83 D9A1 9A36"; + }]; + }; dbohdan = { email = "dbohdan@dbohdan.com"; github = "dbohdan"; From e833e5be2f7a181397c16d2fc85ad3737f67f572 Mon Sep 17 00:00:00 2001 From: David Birks Date: Thu, 22 Oct 2020 00:24:25 -0400 Subject: [PATCH 03/42] lens: init at 3.6.7 --- .../networking/cluster/lens/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/networking/cluster/lens/default.nix diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/applications/networking/cluster/lens/default.nix new file mode 100644 index 00000000000..656badfe5a0 --- /dev/null +++ b/pkgs/applications/networking/cluster/lens/default.nix @@ -0,0 +1,41 @@ +{ lib, fetchurl, appimageTools }: + +let + pname = "lens"; + version = "3.6.7"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/lensapp/lens/releases/download/v${version}/Lens-${version}.AppImage"; + sha256 = "0var7d31ab6lq2vq6brk2dnhlnhqjp2gdqhygif567cdmcpn4vz8"; + name="${pname}.AppImage"; + }; + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; + +in appimageTools.wrapType2 { + inherit name src; + + extraInstallCommands = + '' + mv $out/bin/${name} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/kontena-lens.desktop $out/share/applications/${pname}.desktop + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/kontena-lens.png \ + $out/share/icons/hicolor/512x512/apps/${pname}.png + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Icon=kontena-lens' 'Icon=${pname}' \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "The Kubernetes IDE"; + homepage = "https://k8slens.dev/"; + license = licenses.mit; + maintainers = with maintainers; [ dbirks ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b07bd0db03..97844af8e7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21780,6 +21780,8 @@ in legit = gitAndTools.legit; + lens = callPackage ../applications/networking/cluster/lens { }; + leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { }; libowfat = callPackage ../development/libraries/libowfat { }; From c4853561d30f18f52c16b56ff09a990a94abd86c Mon Sep 17 00:00:00 2001 From: Milan Svoboda Date: Fri, 12 Jun 2020 22:40:29 +0200 Subject: [PATCH 04/42] fix xarchiver --- pkgs/tools/archivers/xarchiver/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index fd53cd9b54b..022c05a4c6f 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt }: +{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, makeWrapper, + coreutils, zip, unzip, p7zip, unrar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }: stdenv.mkDerivation rec { version = "0.5.4.14"; @@ -11,9 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1iklwgykgymrwcc5p1cdbh91v0ih1m58s3w9ndl5kyd44bwlb7px"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper wrapGAppsHook ]; buildInputs = [ gtk3 intltool libxslt ]; + postFixup = '' + wrapProgram $out/bin/xarchiver \ + --prefix PATH : ${stdenv.lib.makeBinPath [ zip unzip p7zip unrar gnutar bzip2 gzip lhasa coreutils ]} + ''; + meta = { description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; homepage = "https://github.com/ib/xarchiver"; From 0262af9cce20f30a163b2b17ba7962883b8c7302 Mon Sep 17 00:00:00 2001 From: Andreas Wiese Date: Tue, 3 Nov 2020 14:58:14 +0100 Subject: [PATCH 05/42] chrysalis: init at 0.7.9 --- pkgs/applications/misc/chrysalis/default.nix | 28 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/misc/chrysalis/default.nix diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/applications/misc/chrysalis/default.nix new file mode 100644 index 00000000000..e79d989e22d --- /dev/null +++ b/pkgs/applications/misc/chrysalis/default.nix @@ -0,0 +1,28 @@ +{ lib, appimageTools, fetchurl }: + +let + pname = "chrysalis"; + version = "0.7.9"; +in appimageTools.wrapType2 rec { + name = "${pname}-${version}-binary"; + + src = fetchurl { + url = "https://github.com/keyboardio/${pname}/releases/download/${pname}-${version}/${pname}-${version}.AppImage"; + sha256 = "12w4vv7dwfpvxpc8kpfas90y7yy8mb8dj2096z3vw1bli5lrn3zi"; + }; + + multiPkgs = null; + extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ + p.glib + ]; + + extraInstallCommands = "mv $out/bin/${name} $out/bin/${pname}"; + + meta = with lib; { + description = "A graphical configurator for Kaleidoscope-powered keyboards"; + homepage = "https://github.com/keyboardio/Chrysalis"; + license = licenses.gpl3; + maintainers = with maintainers; [ aw ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b5b1c9ddcc..fb3340d22bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -176,6 +176,8 @@ in cereal = callPackage ../development/libraries/cereal { }; + chrysalis = callPackage ../applications/misc/chrysalis { }; + clj-kondo = callPackage ../development/tools/clj-kondo { }; cmark = callPackage ../development/libraries/cmark { }; From 983465f13a42075925f78c69950b79d4e41397b5 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 13 Nov 2020 09:36:54 +0200 Subject: [PATCH 06/42] qt515.qtwebkit: unbreak :tada: A copy of #96309 essentially - fix the build of it with bison-3.7. --- pkgs/development/libraries/qt-5/5.15/default.nix | 16 +++++++++++----- .../libraries/qt-5/modules/qtwebkit.nix | 1 - 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index b4e3d681c74..b4486bf025d 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -88,11 +88,17 @@ let }) ] ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; - qtwebkit = [ ./qtwebkit.patch ] - ++ optionals stdenv.isDarwin [ - ./qtwebkit-darwin-no-readline.patch - ./qtwebkit-darwin-no-qos-classes.patch - ]; + qtwebkit = [ + (fetchpatch { + name = "qtwebkit-bison-3.7-build.patch"; + url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; + sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; + }) + ./qtwebkit.patch + ] ++ optionals stdenv.isDarwin [ + ./qtwebkit-darwin-no-readline.patch + ./qtwebkit-darwin-no-qos-classes.patch + ]; qttools = [ ./qttools.patch ]; }; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index b31e57f3806..3d9e72bb54f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -72,7 +72,6 @@ qtModule { preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" ''; meta = { - broken = lib.versionAtLeast qtbase.version "5.15"; maintainers = with stdenv.lib.maintainers; [ abbradar periklis ]; }; } From 7e3d216725f154ad76102c13b1830f9f18ad6d42 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 13 Nov 2020 09:04:34 +0200 Subject: [PATCH 07/42] nextcloud-client: use qt5.15 It segfaults with qt5.14. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7cff959dcf..ba8b1d52e68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5909,7 +5909,7 @@ in inherit (callPackage ../servers/nextcloud {}) nextcloud17 nextcloud18 nextcloud19 nextcloud20; - nextcloud-client = libsForQt514.callPackage ../applications/networking/nextcloud-client { }; + nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; From a942b8d4965afa4a79a4148242ae782ddddc7c82 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 13 Nov 2020 11:01:16 +0200 Subject: [PATCH 08/42] kmymoney: Use qt5.15 (with unbroken qt515.qtwebkit) --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba8b1d52e68..f526cf24584 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21986,8 +21986,7 @@ in kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; - # Pinned to qt5.14 due to kdewebkit (depends on qtwebkit) which is currently broken with qt5.15 - kmymoney = libsForQt514.callPackage ../applications/office/kmymoney { }; + kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { }; kodestudio = callPackage ../applications/editors/kodestudio { }; From 4688540ba99e004299a75843b940280ef6c7b3bd Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 20 Nov 2020 13:39:21 +0200 Subject: [PATCH 09/42] konversation: 1.7.5 -> 1.7.7 --- .../networking/irc/konversation/default.nix | 18 ++++-------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix index 2890deccb80..3c80ef09aaf 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/networking/irc/konversation/default.nix @@ -28,25 +28,15 @@ , phonon }: -let +mkDerivation rec { pname = "konversation"; - version = "1.7.5"; -in mkDerivation rec { - name = "${pname}-${version}"; + version = "1.7.7"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "0h098yhlp36ls6pdvs2r93ig8dv4fys62m0h6wxccprb0qrpbgv0"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; + sha256 = "R+wWHBOFmBqLmdKMQZ6Iskgj3AG2j7FiOJSBiXTCGKc="; }; - patches = [ - # Delete this patch for konversation > 1.7.5 - (fetchpatch { - url = "https://cgit.kde.org/konversation.git/patch/?id=4d0036617becc26a76fd021138c98aceec4c7b53"; - sha256 = "17hdj6zyln3n93b71by26mrwbgyh4k052ck5iw1drysx5dyd5l6y"; - }) - ]; - buildInputs = [ kbookmarks karchive diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f526cf24584..49c1cb99282 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21992,7 +21992,7 @@ in kondo = callPackage ../applications/misc/kondo { }; - konversation = libsForQt514.callPackage ../applications/networking/irc/konversation { }; + konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { }; kotatogram-desktop = libsForQt514.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; From 496222a7d9d84365ba56576637a5eb461283a3ca Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 13 Nov 2020 09:04:14 +0200 Subject: [PATCH 10/42] digitalbitbox: mention that it segfaults with qt5.15 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49c1cb99282..ac145363c65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -234,6 +234,7 @@ in archiver = callPackage ../applications/misc/archiver { }; + # It segfaults if it uses qt5.15 digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { }; grsync = callPackage ../applications/misc/grsync { }; From 1b04eac101f24015fc787bf4341a885e0216f74e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 13 Nov 2020 09:03:57 +0200 Subject: [PATCH 11/42] clementine: comment it should support qt5.15 on next update --- pkgs/applications/audio/clementine/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 0c1690f1462..d9d1a11ce1d 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -10,6 +10,7 @@ let withCD = config.clementine.cd or true; withCloud = config.clementine.cloud or true; + # On the update after all 1.4rc, qt5.15 will be supported. version = "1.4.0rc1"; src = fetchFromGitHub { From 5ab7eaa96d5f46c94e8e309b5de8ce119bc8b423 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 21 Nov 2020 11:17:32 +0200 Subject: [PATCH 12/42] vlc: Use qt515 (add QPainterPath patch from OpenSUSE) --- pkgs/applications/video/vlc/default.nix | 7 +++- .../fix-missing-includes-with-qt-5.15.patch | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 58df85332ea..1c52a89e98d 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -32,6 +32,12 @@ stdenv.mkDerivation rec { sha256 = "1f46h0hv7fk35zg4iczlp7ib7h2jmh8m4r5klw3g2558ib9134qq"; }; + patches = [ + # Couldn't find an upstream version of this patch + # https://build.opensuse.org/package/view_file/openSUSE:Factory/vlc/fix-missing-includes-with-qt-5.15.patch?expand=1 + ./fix-missing-includes-with-qt-5.15.patch + ]; + # VLC uses a *ton* of libraries for various pieces of functionality, many of # which are not included here for no other reason that nobody has mentioned # needing them @@ -99,6 +105,5 @@ stdenv.mkDerivation rec { homepage = "http://www.videolan.org/vlc/"; license = licenses.lgpl21Plus; platforms = platforms.linux; - broken = if qtbase != null then versionAtLeast qtbase.version "5.15" else false; }; } diff --git a/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch b/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch new file mode 100644 index 00000000000..d980fd2f6da --- /dev/null +++ b/pkgs/applications/video/vlc/fix-missing-includes-with-qt-5.15.patch @@ -0,0 +1,37 @@ +Index: vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp +=================================================================== +--- vlc-3.0.8.orig/modules/gui/qt/util/timetooltip.hpp ++++ vlc-3.0.8/modules/gui/qt/util/timetooltip.hpp +@@ -25,6 +25,7 @@ + #include "qt.hpp" + + #include ++#include + + class TimeTooltip : public QWidget + { +Index: vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp +=================================================================== +--- vlc-3.0.8.orig/modules/gui/qt/components/playlist/views.cpp ++++ vlc-3.0.8/modules/gui/qt/components/playlist/views.cpp +@@ -27,6 +27,7 @@ + #include "input_manager.hpp" /* THEMIM */ + + #include ++#include + #include + #include + #include +Index: vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp +=================================================================== +--- vlc-3.0.8.orig/modules/gui/qt/dialogs/plugins.cpp ++++ vlc-3.0.8/modules/gui/qt/dialogs/plugins.cpp +@@ -53,6 +53,7 @@ + #include + #include + #include ++#include + #include + #include + #include + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac145363c65..7c2a71aa09e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24291,7 +24291,7 @@ in vkeybd = callPackage ../applications/audio/vkeybd {}; - vlc = libsForQt514.callPackage ../applications/video/vlc {}; + vlc = libsForQt5.callPackage ../applications/video/vlc {}; vlc_qt5 = vlc; From 4180a96e52161af3364709a1e2bf8b91fe92dc26 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 21 Nov 2020 11:29:19 +0200 Subject: [PATCH 13/42] qtikz: Use qt5.15 (Add QPainterPath patch) --- pkgs/applications/graphics/ktikz/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index f817a332160..d0d9f100878 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -31,10 +31,16 @@ stdenv.mkDerivation rec { }; patches = [ + # Fix version in qtikz.pro (fetchpatch { url = "https://github.com/fhackenberger/ktikz/commit/972685a406517bb85eb561f2c8e26f029eacd7db.patch"; sha256 = "13z40rcd4m4n088v7z2ns17lnpn0z3rzp31lsamic3qdcwjwa5k8"; }) + # Fix missing qt5.15 QPainterPath include + (fetchpatch { + url = "https://github.com/fhackenberger/ktikz/commit/ebe4dfb72ac8a137b475ef688b9f7ac3e5c7f242.patch"; + sha256 = "GIgPh+iUBPftHKIpZR3a0FxmLhMLuPUapF/t+bCuqMs="; + }) ]; nativeBuildInputs = [ pkgconfig qttools qmake wrapQtAppsHook ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c2a71aa09e..6459f07ff5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6727,7 +6727,7 @@ in qr-filetransfer = callPackage ../tools/networking/qr-filetransfer { }; - qtikz = libsForQt514.callPackage ../applications/graphics/ktikz { }; + qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; quickjs = callPackage ../development/interpreters/quickjs { }; From 77f5eacf9d523a0d261905e2b29bbf66c4e9ef62 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 22 Nov 2020 23:42:45 +0200 Subject: [PATCH 14/42] qsyncthingtray: use qt515 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6459f07ff5b..f0a95dc7dda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23292,7 +23292,7 @@ in qsstv = qt5.callPackage ../applications/radio/qsstv { }; - qsyncthingtray = libsForQt514.callPackage ../applications/misc/qsyncthingtray { }; + qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { guvcview = guvcview.override { From c2429bba12affd3951306904d4719fe061816758 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 28 Nov 2020 09:54:45 +0100 Subject: [PATCH 15/42] smpeg2: 412 -> unstable-2017-10-18 drop patch not needed anymore Co-authored-by: Nikolay Amiantov --- pkgs/development/libraries/smpeg2/default.nix | 27 +++++++++++-------- .../{gcc6.patch => hufftable-uint_max.patch} | 0 pkgs/development/libraries/smpeg2/sdl2.patch | 22 --------------- 3 files changed, 16 insertions(+), 33 deletions(-) rename pkgs/development/libraries/smpeg2/{gcc6.patch => hufftable-uint_max.patch} (100%) delete mode 100644 pkgs/development/libraries/smpeg2/sdl2.patch diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/development/libraries/smpeg2/default.nix index fc42ab989eb..270e418174e 100644 --- a/pkgs/development/libraries/smpeg2/default.nix +++ b/pkgs/development/libraries/smpeg2/default.nix @@ -1,21 +1,28 @@ -{ stdenv, darwin, fetchsvn, autoconf, automake, pkgconfig, makeWrapper, SDL2 }: +{ stdenv +, autoconf +, automake +, darwin +, fetchsvn +, makeWrapper +, pkg-config +, SDL2 +}: stdenv.mkDerivation rec { - name = "smpeg2-svn${version}"; - version = "412"; + pname = "smpeg2"; + version = "unstable-2017-10-18"; src = fetchsvn { url = "svn://svn.icculus.org/smpeg/trunk"; - rev = version; - sha256 = "1irf2d8f150j8cx8lbb0pz1rijap536crsz0mw871xrh6wd2fd96"; + rev = "413"; + sha256 = "193amdwgxkb1zp7pgr72fvrdhcg3ly72qpixfxxm85rzz8g2kr77"; }; patches = [ - ./gcc6.patch - ./sdl2.patch + ./hufftable-uint_max.patch ]; - nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoconf automake makeWrapper pkg-config ]; buildInputs = [ SDL2 ] ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; @@ -25,10 +32,8 @@ stdenv.mkDerivation rec { ''; postInstall = '' - sed -e 's,#include "\(SDL.*.h\)",#include ,' -i $out/include/smpeg2/*.h - wrapProgram $out/bin/smpeg2-config \ - --prefix PATH ":" "${pkgconfig}/bin" \ + --prefix PATH ":" "${pkg-config}/bin" \ --prefix PKG_CONFIG_PATH ":" "${SDL2.dev}/lib/pkgconfig" ''; diff --git a/pkgs/development/libraries/smpeg2/gcc6.patch b/pkgs/development/libraries/smpeg2/hufftable-uint_max.patch similarity index 100% rename from pkgs/development/libraries/smpeg2/gcc6.patch rename to pkgs/development/libraries/smpeg2/hufftable-uint_max.patch diff --git a/pkgs/development/libraries/smpeg2/sdl2.patch b/pkgs/development/libraries/smpeg2/sdl2.patch deleted file mode 100644 index 63bc352976e..00000000000 --- a/pkgs/development/libraries/smpeg2/sdl2.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/smpeg2-config.in b/smpeg2-config.in -index 5cce954..0e61939 100644 ---- a/smpeg2-config.in -+++ b/smpeg2-config.in -@@ -42,7 +42,7 @@ while test $# -gt 0; do - if test @includedir@ != /usr/include ; then - includes=-I@includedir@ - fi -- echo $includes -I@includedir@/smpeg2 `@SDL_CONFIG@ --cflags` -+ echo $includes -I@includedir@/smpeg2 `@SDL2_CONFIG@ --cflags` - ;; - --libs) - if [ "`uname`" = "SunOS" ]; then -@@ -50,7 +50,7 @@ while test $# -gt 0; do - else - libdirs="-L@libdir@ @SMPEG_RLD_FLAGS@" - fi -- echo $libdirs -lsmpeg2 `@SDL_CONFIG@ --libs` -+ echo $libdirs -lsmpeg2 `@SDL2_CONFIG@ --libs` - ;; - *) - echo "${usage}" 1>&2 From ae322db745cf252ddeecc2c451ba9340483f6989 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 28 Nov 2020 10:13:19 +0100 Subject: [PATCH 16/42] SDL2_mixer: enable midi by default, cleanup package Co-authored-by: Nikolay Amiantov --- .../libraries/SDL2_mixer/default.nix | 58 ++++++++++++++----- 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index c90c0fd08a8..af0da7dc627 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -1,7 +1,19 @@ -{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, which -, SDL2, libogg, libvorbis, smpeg2, flac, libmodplug, opusfile, mpg123 -, CoreServices, AudioUnit, AudioToolbox -, enableNativeMidi ? false, fluidsynth ? null }: +{ stdenv +, fetchurl +, pkg-config +, AudioToolbox +, AudioUnit +, CoreServices +, SDL2 +, flac +, fluidsynth +, libmodplug +, libogg +, libvorbis +, mpg123 +, opusfile +, smpeg2 +}: stdenv.mkDerivation rec { pname = "SDL2_mixer"; @@ -12,19 +24,37 @@ stdenv.mkDerivation rec { sha256 = "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl"; }; - preAutoreconf = '' - aclocal - ''; + nativeBuildInputs = [ pkg-config ]; - nativeBuildInputs = [ autoreconfHook pkgconfig which ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + AudioToolbox + AudioUnit + CoreServices + ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; + propagatedBuildInputs = [ + SDL2 + flac + fluidsynth + libmodplug + libogg + libvorbis + mpg123 + opusfile + smpeg2 + ]; - propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug opusfile mpg123 ]; - - configureFlags = [ "--disable-music-ogg-shared" ] - ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl" - ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ]; + configureFlags = [ + "--disable-music-ogg-shared" + "--disable-music-flac-shared" + "--disable-music-mod-modplug-shared" + "--disable-music-mp3-mpg123-shared" + "--disable-music-opus-shared" + "--disable-music-midi-fluidsynth-shared" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "--disable-sdltest" + "--disable-smpegtest" + ]; meta = with stdenv.lib; { description = "SDL multi-channel audio mixer library"; From 7236fe248dbf5394725bca685c9f6bc7ed203a6e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 29 Nov 2020 08:40:07 -0500 Subject: [PATCH 17/42] yoda: 1.8.4 -> 1.8.5 --- pkgs/development/libraries/physics/yoda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 273566adc03..3a8fbbbdd52 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yoda"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - sha256 = "03hm7hax0n5irqi0kzjag6fyr9zws9jqz95hr8afpikwkcfa894x"; + sha256 = "1z9jmabsaddhs003zzq73fpq2absd12rnc2sa5qn45zwf62nnbjc"; }; nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; From 7e9337f2e438f9714333efa156f2eb00913c27f0 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 29 Nov 2020 08:40:23 -0500 Subject: [PATCH 18/42] rivet: 3.1.2 -> 3.1.3 --- pkgs/development/libraries/physics/rivet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index abf37def8c3..f95328964bf 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rivet"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "0yjpx7n6ry3pfgkf7d7v7mcc3yv7681kf8nq2b1fgspl8jbd0hf0"; + sha256 = "08g0f84l7r6vm4n7gn36qi3bzacscpv061m9xar2572vf10wxpak"; }; patches = [ From 2c4d7f13423fb83b829975e927b5c6146944c0a1 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 2 Dec 2020 20:12:09 -0500 Subject: [PATCH 19/42] kodi: accept plugins without extraRuntimeDependencies --- pkgs/applications/video/kodi/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index 6a0b1cbdf73..d0a7ed5e23c 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -19,7 +19,7 @@ in buildEnv { --prefix KODI_HOME : $out/share/kodi \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath (stdenv.lib.concatMap - (plugin: plugin.extraRuntimeDependencies) plugins)}" + (plugin: plugin.extraRuntimeDependencies or []) plugins)}" done ''; From 393c770cc23122730547c087a60ac5d54095ecd0 Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Thu, 3 Dec 2020 12:05:14 +0100 Subject: [PATCH 20/42] mucommander: Use jdk11 & gradle6 --- pkgs/applications/misc/mucommander/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/misc/mucommander/default.nix index e598e099d06..a1e02dbe18e 100644 --- a/pkgs/applications/misc/mucommander/default.nix +++ b/pkgs/applications/misc/mucommander/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gradle_4_10, perl, makeWrapper, jre, gsettings-desktop-schemas }: +{ stdenv, fetchFromGitHub, gradle_6, perl, makeWrapper, jdk11, gsettings-desktop-schemas }: let version = "0.9.3-3"; @@ -36,7 +36,7 @@ let deps = stdenv.mkDerivation { name = "${name}-deps"; inherit src postPatch; - nativeBuildInputs = [ gradle_4_10 perl ]; + nativeBuildInputs = [ gradle_6 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) gradle --no-daemon build @@ -54,7 +54,7 @@ let in stdenv.mkDerivation { inherit name src postPatch; - nativeBuildInputs = [ gradle_4_10 perl makeWrapper ]; + nativeBuildInputs = [ gradle_6 perl makeWrapper ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -73,7 +73,7 @@ in stdenv.mkDerivation { tar xvf build/distributions/mucommander-${version}.tar --directory=$out --strip=1 wrapProgram $out/bin/mucommander \ --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ - --set JAVA_HOME ${jre} + --set JAVA_HOME ${jdk11} ''; meta = with stdenv.lib; { @@ -81,6 +81,9 @@ in stdenv.mkDerivation { description = "Cross-platform file manager"; license = licenses.gpl3; maintainers = with maintainers; [ volth ]; + # build is broken on MacOS + # https://github.com/NixOS/nixpkgs/pull/105784 + broken = stdenv.isDarwin; platforms = platforms.all; }; } From 2fcac5f9faee1d9164857ef5bc952dd14c9999c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 9 Dec 2020 09:08:59 +0100 Subject: [PATCH 21/42] _1password-gui: 0.9.6 -> 0.9.7 Changes: https://releases.1password.com/linux/0.9/#1password-for-linux-0.9.7 --- pkgs/tools/security/1password-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix index 777e7292fde..667a21343e6 100644 --- a/pkgs/tools/security/1password-gui/default.nix +++ b/pkgs/tools/security/1password-gui/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.6"; + version = "0.9.7"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - sha256 = "0464a5d39g20hif3dz3qr78dqb0cmxbazy0q48j9gkawhxm30c1h"; + hash = "sha256-JaYFJL24Pgwh5CrsKjJPL8u0fx1x0beFTK+EGNT1iqA="; }; nativeBuildInputs = [ makeWrapper ]; From 0d1a3caeb6f093af81fd43d9b81ea1452e48fc73 Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Mon, 7 Dec 2020 14:26:25 -0600 Subject: [PATCH 22/42] librtprocess: init at 0.11.0 --- .../libraries/librtprocess/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/librtprocess/default.nix diff --git a/pkgs/development/libraries/librtprocess/default.nix b/pkgs/development/libraries/librtprocess/default.nix new file mode 100644 index 00000000000..adabbe11cb3 --- /dev/null +++ b/pkgs/development/libraries/librtprocess/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "librtprocess"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "CarVac"; + repo = pname; + rev = version; + sha256 = "1bivy3rymmmkdx5phbxq4qaq15hw633dgpks57z9ara15mh817xx"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/CarVac/librtprocess"; + description = "Highly optimized library for processing RAW images"; + license = licenses.gpl3; + maintainers = with maintainers; [ hjones2199 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eeb75cdf1f5..dca91a3680c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14246,6 +14246,8 @@ in librime = callPackage ../development/libraries/librime {}; + librtprocess = callPackage ../development/libraries/librtprocess { }; + libsamplerate = callPackage ../development/libraries/libsamplerate { inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon CoreServices; }; From b7cf39083799736b505ccc1a9a4fa0bddde1eb84 Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Wed, 9 Dec 2020 06:29:13 +0100 Subject: [PATCH 23/42] pythonPackages.tldextract: add missing dependency --- .../development/python-modules/tldextract/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index 02359ce67a5..b91289e5061 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage, setuptools_scm -, requests, requests-file, idna, pytest +, requests, requests-file, idna, filelock, pytest , responses }: @@ -12,14 +12,17 @@ buildPythonPackage rec { sha256 = "cfae9bc8bda37c3e8c7c8639711ad20e95dc85b207a256b60b0b23d7ff5540ea"; }; - propagatedBuildInputs = [ requests requests-file idna ]; + propagatedBuildInputs = [ requests requests-file idna filelock ]; checkInputs = [ pytest responses ]; nativeBuildInputs = [ setuptools_scm ]; + # No tests included + doCheck = false; + pythonImportsCheck = [ "tldextract" ]; + meta = { homepage = "https://github.com/john-kurkowski/tldextract"; - description = "Accurately separate the TLD from the registered domain and subdomains of a URL, using the Public Suffix List."; + description = "Accurately separate the TLD from the registered domain and subdomains of a URL, using the Public Suffix List"; license = lib.licenses.bsd3; }; - } From 14eab894c1629eccde2fba95e88f81b497f82d30 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 9 Dec 2020 08:17:40 -0500 Subject: [PATCH 24/42] Update aqbanking, etc. --- pkgs/development/libraries/aqbanking/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/aqbanking/sources.nix b/pkgs/development/libraries/aqbanking/sources.nix index 8016053c42d..3713a257663 100644 --- a/pkgs/development/libraries/aqbanking/sources.nix +++ b/pkgs/development/libraries/aqbanking/sources.nix @@ -1,11 +1,11 @@ { - gwenhywfar.version = "5.1.3"; - gwenhywfar.sha256 = "0xjr9d94y46h7pfdhz5ygn01pmlm66rhiybr520h13nvjh4zid0r"; - gwenhywfar.releaseId = "242"; + gwenhywfar.version = "5.4.1"; + gwenhywfar.sha256 = "16waq39mbhhjcma2ykdbqvpcw0ba3ksqqwsp55zczhg320s41zgv"; + gwenhywfar.releaseId = "344"; libchipcard.version = "5.0.4"; libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj"; libchipcard.releaseId = "158"; - aqbanking.version = "6.0.2"; - aqbanking.sha256 = "0n41n3yki1wmax4i9wi485g8zqb43z1adywcixzfq9gbdjhz05hx"; - aqbanking.releaseId = "273"; + aqbanking.version = "6.2.5"; + aqbanking.sha256 = "1pyny15g8y5dzzl4yg7jjnavygfzsi2g1jl7as9grqy77q70cnyg"; + aqbanking.releaseId = "342"; } From 401ab9f095a3ee6a4354e27b4ae1dfff181388da Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Tue, 3 Nov 2020 03:39:40 +0300 Subject: [PATCH 25/42] terraform-ls: 0.7.0 -> 0.10.0, switch to buildGoModule --- pkgs/development/tools/misc/terraform-ls/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 4d999f32446..763cd4fcdb4 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -1,18 +1,22 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "terraform-ls"; - version = "0.7.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "1afdd1zs242nh1cync5ip1fbah34wc3gbsx3hwwiisc8yziwiq18"; + sha256 = "XOKaNpYR31lKpA33+7WU2KYjgEx4g6gpp3IAjWtb3Zk="; }; + vendorSha256 = "8NdeCD558r0tV+ZR4MvLl5CzeNj8cUGtqwvJ2ZhS7mI="; goPackagePath = "github.com/hashicorp/terraform-ls"; + # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com + doCheck = false; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; meta = with lib; { From ddf90cb942494ab0fbac9cb3c087d709783fa36c Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Wed, 9 Dec 2020 20:53:17 +0100 Subject: [PATCH 26/42] spdlog: use nixpkgs' fmt instead of bundled one --- .../instant-messengers/nheko/default.nix | 2 ++ .../hal-hardware-analyzer/default.nix | 12 +++++----- pkgs/development/libraries/spdlog/default.nix | 4 +++- .../python-modules/qiskit-aer/default.nix | 2 ++ .../cmake-def-spdlog-fmt-external.patch | 11 +++++++++ pkgs/tools/filesystems/lizardfs/default.nix | 23 ++++++++++++------- 6 files changed, 39 insertions(+), 15 deletions(-) create mode 100644 pkgs/tools/filesystems/lizardfs/cmake-def-spdlog-fmt-external.patch diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 2f5316c9fe2..80ffbebe9be 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -17,6 +17,7 @@ , mtxclient , boost17x , spdlog +, fmt , olm , pkgconfig , nlohmann_json @@ -47,6 +48,7 @@ mkDerivation rec { boost17x lmdb spdlog + fmt cmark qtbase qtmultimedia diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index 06053a8f356..2247ece9fab 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, python3Packages , boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook -, llvmPackages ? null +, fmt, llvmPackages ? null }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ninja pkgconfig ]; - buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog wrapQtAppsHook ] + buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt wrapQtAppsHook ] ++ (with python3Packages; [ python pybind11 ]) ++ stdenv.lib.optional stdenv.cc.isClang llvmPackages.openmp; @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { # the qt mkDerivation - the latter forcibly overrides this. cmakeBuildType = "MinSizeRel"; - meta = { + meta = with stdenv.lib { description = "A comprehensive reverse engineering and manipulation framework for gate-level netlists"; homepage = "https://github.com/emsec/hal"; - license = stdenv.lib.licenses.mit; - platforms = with stdenv.lib.platforms; unix; - maintainers = with stdenv.lib.maintainers; [ ris ]; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ ris shamilton ]; }; } diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 2022ec7caaa..fbe7af1825e 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake, fmt }: let generic = { version, sha256 }: @@ -14,12 +14,14 @@ let }; nativeBuildInputs = [ cmake ]; + buildInputs = [ fmt ]; cmakeFlags = [ "-DSPDLOG_BUILD_SHARED=ON" "-DSPDLOG_BUILD_EXAMPLE=OFF" "-DSPDLOG_BUILD_BENCH=OFF" "-DSPDLOG_BUILD_TESTS=ON" + "-DSPDLOG_FMT_EXTERNAL=ON" ]; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 57d89b55711..e5eb877b6b2 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -8,6 +8,7 @@ , catch2 , cmake , cython +, fmt , muparserx , ninja , nlohmann_json @@ -47,6 +48,7 @@ buildPythonPackage rec { buildInputs = [ blas catch2 + fmt muparserx nlohmann_json spdlog diff --git a/pkgs/tools/filesystems/lizardfs/cmake-def-spdlog-fmt-external.patch b/pkgs/tools/filesystems/lizardfs/cmake-def-spdlog-fmt-external.patch new file mode 100644 index 00000000000..51ffa92652e --- /dev/null +++ b/pkgs/tools/filesystems/lizardfs/cmake-def-spdlog-fmt-external.patch @@ -0,0 +1,11 @@ +diff --color -ur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2020-12-10 10:39:37.775694976 +0100 ++++ b/CMakeLists.txt 2020-12-10 10:40:41.984575938 +0100 +@@ -127,6 +127,7 @@ + add_definitions(-D__STDC_LIMIT_MACROS) + add_definitions(-D__STDC_CONSTANT_MACROS) + add_definitions(-D__STDC_FORMAT_MACROS) ++add_definitions(-DSPDLOG_FMT_EXTERNAL) + if(MINGW) + add_definitions(-DWINVER=0x0602) + add_definitions(-D_WIN32_WINNT=0x0602) diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index e2cb603ca3d..13086c067b0 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -16,6 +16,7 @@ , judy , pam , spdlog +, fmt , zlib # optional }: @@ -30,13 +31,6 @@ stdenv.mkDerivation rec { sha256 = "0zk73wmx82ari3m2mv0zx04x1ggsdmwcwn7k6bkl5c0jnxffc4ax"; }; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; - - buildInputs = - [ db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl - zlib boost judy pam spdlog python2 - ]; - patches = [ # Use system-provided spdlog instead of downloading an old one (next two patches) (fetchpatch { @@ -53,13 +47,26 @@ stdenv.mkDerivation rec { url = "https://github.com/lizardfs/lizardfs/commit/5d20c95179be09241b039050bceda3c46980c004.patch"; sha256 = "185bfcz2rjr4cnxld2yc2nxwzz0rk4x1fl1sd25g8gr5advllmdv"; }) + # Add SPDLOG_FMT_EXTERNAL flag to disable spdlog from using bundled fmt + # Would use https://github.com/lizardfs/lizardfs/commit/31b0cd40f84ee75f99643ad19122061e3d6fb6cc.patch + # if it didn't failed to patch + ./cmake-def-spdlog-fmt-external.patch ]; + nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + + buildInputs = + [ db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl + zlib boost judy pam spdlog fmt python2 + ]; + + cmakeFlags = [ "-DSPDLOG_FMT_EXTERNAL=ON" ]; + meta = with stdenv.lib; { homepage = "https://lizardfs.com"; description = "A highly reliable, scalable and efficient distributed file system"; platforms = platforms.linux; license = licenses.gpl3; - maintainers = [ maintainers.rushmorem ]; + maintainers = with maintainers; [ rushmorem shamilton ]; }; } From 8cbf5337dc95c2a28fc609f19c562b702b744ad4 Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Thu, 10 Dec 2020 12:01:32 +0100 Subject: [PATCH 27/42] kubernetes: 1.19.4 -> 1.19.5 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index cdda1487a49..d4ec9cf5ef3 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.19.4"; + version = "1.19.5"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "05gisihrklkzsdsrrmvmqlfwfdx73jbwd5668n5wa5hp432qyvwi"; + sha256 = "15bv620fj4x731f2z2a9dcdss18rk379kc40g49bpqsdn42jjx2z"; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; From e688c61c248437505defd2b91438e16fb22eafa2 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 20 Nov 2020 10:56:11 +0000 Subject: [PATCH 28/42] octant: 0.16.0 -> 0.16.2 --- pkgs/applications/networking/cluster/octant/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index 9e37bb6afe2..ef32a6c69fa 100644 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: let - version = "0.16.0"; + version = "0.16.2"; system = stdenv.hostPlatform.system; suffix = { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { inherit version; src = fetchsrc { - x86_64-linux = "1i6i42hwxaczkfv8ldxn3wp6bslgwfkycvh88khfmapw2f5f9mhr"; - aarch64-linux = "1ka5vscyqxckxnhnymp06yi0r2ljw42q0g62yq7qv4safljd452p"; - x86_64-darwin = "1c50c2r2hq2fi8jcijq6vn336w96ar7b6qccv5w2240i0szsxxql"; + x86_64-linux = "1jg4268vm3hv2jh4p5cnn6lc0p2sv6fg2gc88kxxbnigncdv53gz"; + aarch64-linux = "0indvix9x2f0izqz21lgahlq60lq5xj5kvn8c9dss0hqnfvfxzz2"; + x86_64-darwin = "0awhl8fkqmgzavmx7qw9w97grfqkwmjsk5nra24vdm91w8vx0m53"; }; doBuild = false; From ea7c2cfa567eae4e7af6911864abfe5bb465ae64 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 10 Dec 2020 13:51:54 +0000 Subject: [PATCH 29/42] octant: 0.16.2 -> 0.16.3 --- pkgs/applications/networking/cluster/octant/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index ef32a6c69fa..4ccc05189c9 100644 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: let - version = "0.16.2"; + version = "0.16.3"; system = stdenv.hostPlatform.system; suffix = { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { inherit version; src = fetchsrc { - x86_64-linux = "1jg4268vm3hv2jh4p5cnn6lc0p2sv6fg2gc88kxxbnigncdv53gz"; - aarch64-linux = "0indvix9x2f0izqz21lgahlq60lq5xj5kvn8c9dss0hqnfvfxzz2"; - x86_64-darwin = "0awhl8fkqmgzavmx7qw9w97grfqkwmjsk5nra24vdm91w8vx0m53"; + x86_64-linux = "1c6v7d8i494k32b0zrjn4fn1idza95r6h99c33c5za4hi7gqvy0x"; + aarch64-linux = "153jd4wsq8qc598w7y4d30dy20ljyhrl68cc3pig1p712l5258zs"; + x86_64-darwin = "0y2qjdlyvhrzwg0fmxsr3jl39kd13276a7wg0ndhdjfwxvdwpxkz"; }; doBuild = false; From d98fae8072b7878f55180746a184d886d3c95e9f Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Thu, 10 Dec 2020 16:35:46 +0100 Subject: [PATCH 30/42] Update pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix Co-authored-by: Drew --- .../science/electronics/hal-hardware-analyzer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index 2247ece9fab..c0a2ddb7a09 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # the qt mkDerivation - the latter forcibly overrides this. cmakeBuildType = "MinSizeRel"; - meta = with stdenv.lib { + meta = with stdenv.lib; { description = "A comprehensive reverse engineering and manipulation framework for gate-level netlists"; homepage = "https://github.com/emsec/hal"; license = licenses.mit; From 27dacb8b4b2430a38f36cf9aa4e0c8470e4841da Mon Sep 17 00:00:00 2001 From: Marc 'risson' Schmitt Date: Thu, 10 Dec 2020 18:49:05 +0100 Subject: [PATCH 31/42] nixos/postfix: fix masterCf type Signed-off-by: Marc 'risson' Schmitt --- nixos/modules/services/mail/postfix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 319b3b63844..795a76f748a 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -52,7 +52,7 @@ let }; type = mkOption { - type = types.enum [ "inet" "unix" "fifo" "pass" ]; + type = types.enum [ "inet" "unix" "unix-dgram" "fifo" "pass" ]; default = "unix"; example = "inet"; description = "The type of the service"; From eb851979623c2353a942532c1b402b7c77223457 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 10 Dec 2020 20:38:13 +0000 Subject: [PATCH 32/42] monero-gui: 0.17.1.5 -> 0.17.1.6 --- pkgs/applications/blockchains/monero-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 16f4aefe349..fb6753f79a5 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -27,13 +27,13 @@ in stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.1.5"; + version = "0.17.1.6"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "0qlcqli0wvrjfy89mbgh1hpmk60dxgn5sws93h8lhgyfwx557iw0"; + sha256 = "0kn5wvx2psbdaqmy1cxlbf5l1mdpvh0b6hh9drah3s7nj3654a3r"; }; nativeBuildInputs = [ From c2c9fcc89648bc33c7568db7b4a5364cbc7b8146 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 9 Dec 2020 11:04:17 -0500 Subject: [PATCH 33/42] python3Packages.psautohint: disable slow tests * Reduces test time from ~5 mins to ~30 seconds. * Also converts to pytestCheckHook for better test control. * Makes fetchFromGitHub variables match convention. * remove pytest-randomly. pytest-randomly will randomize test order & reset random seeds between tests. We don't want the random test ordering for reproducible builds, so we remove it. * Fixes flaky test "test_hashmap_old_version" by pinning pytest to v5, corresponding to upstream issue: https://github.com/adobe-type-tools/psautohint/issues/284#issuecomment-742800965 py3.psautohint: use pytest5 --- .../python-modules/psautohint/default.nix | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index fb9237c8934..61828ddff00 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder , fonttools, lxml, fs , setuptools_scm -, pytest, pytestcov, pytest_xdist, pytest-randomly +, pytestCheckHook, pytest_5, pytestcov, pytest_xdist }: buildPythonPackage rec { @@ -11,10 +11,10 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "adobe-type-tools"; - repo = pname; + owner = "adobe-type-tools"; + repo = pname; + rev = "v${version}"; sha256 = "1s2l54gzn11y07zaggprwif7r3ia244qijjhkbvjdx4jsgc5df8n"; - rev = "v${version}"; fetchSubmodules = true; # data dir for tests }; @@ -28,8 +28,24 @@ buildPythonPackage rec { propagatedBuildInputs = [ fonttools lxml fs ]; - checkInputs = [ pytest pytestcov pytest_xdist pytest-randomly ]; - checkPhase = "pytest tests"; + checkInputs = [ + # Override pytestCheckHook to use pytest v5, because some tests fail on pytest >= v6 + # https://github.com/adobe-type-tools/psautohint/issues/284#issuecomment-742800965 + # Override might be able to be removed in future, check package dependency pins (coverage.yml) + (pytestCheckHook.override{ pytest = pytest_5; }) + pytestcov + pytest_xdist + ]; + disabledTests = [ + # Slow tests, reduces test time from ~5 mins to ~30s + "test_mmufo" + "test_flex_ufo" + "test_ufo" + "test_flex_otf" + "test_multi_outpath" + "test_mmhint" + "test_otf" + ]; meta = with lib; { description = "Script to normalize the XML and other data inside of a UFO"; From d6187d51636cde418e9dc9b6f51dfb964e250c35 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 9 Dec 2020 11:48:36 -0500 Subject: [PATCH 34/42] python3Packages.afdko: use pytestCheckHook Convert to standard pytestCheckHook. This allows easier testing of derivation build & disabling tests. Also disable slow tests. --- .../python-modules/afdko/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index f1e3bf0cd56..6371fa804bb 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -3,7 +3,7 @@ , brotli, fontmath, mutatormath, booleanoperations , ufoprocessor, ufonormalizer, psautohint, tqdm , setuptools_scm -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -52,10 +52,18 @@ buildPythonPackage rec { # https://github.com/adobe-type-tools/afdko/issues/1163 # https://github.com/adobe-type-tools/afdko/issues/1216 doCheck = stdenv.isx86_64; - checkInputs = [ pytest ]; - checkPhase = '' - PATH="$PATH:$out/bin" py.test - ''; + checkInputs = [ pytestCheckHook ]; + preCheck = "export PATH=$PATH:$out/bin"; + disabledTests = [ + # Disable slow tests, reduces test time ~25 % + "test_report" + "test_post_overflow" + "test_cjk" + "test_extrapolate" + "test_filename_without_dir" + "test_overwrite" + "test_options" + ]; meta = with stdenv.lib; { description = "Adobe Font Development Kit for OpenType"; From 1e67bbac0a9b301db4c2356b35c30cbc14c17ad7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 11 Dec 2020 04:21:37 +0000 Subject: [PATCH 35/42] turbo-geth: 2020.12.01 -> 2020.12.02 --- pkgs/applications/blockchains/turbo-geth.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix index b8aa3de44da..cf0b60ab985 100644 --- a/pkgs/applications/blockchains/turbo-geth.nix +++ b/pkgs/applications/blockchains/turbo-geth.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "turbo-geth"; - version = "2020.12.01"; + version = "2020.12.02"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "0l1qj10vhfkrk66zihz8m24pnyj8jbb65a7amvphp07r199swy2a"; + sha256 = "0ynnpvpd84qncvzmk4hmq8mn6m14a9p3zg4svijqwlsrr39amp3q"; }; - vendorSha256 = "16vawkky612zf45d8dhipjmhrprmi28z9wdcnjy07x3bxdyfbhfr"; + vendorSha256 = "0sk064iyaxq9ig9xv3h1p1c4994hna9bky16g3hblbnh3v7mmqar"; runVend = true; subPackages = [ From 69741a7a483ec9fd85dd050f01ccee5502c970d6 Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Tue, 10 Nov 2020 13:46:33 -0600 Subject: [PATCH 36/42] siril: init at 0.99.6 --- .../science/astronomy/siril/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/science/astronomy/siril/default.nix diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/applications/science/astronomy/siril/default.nix new file mode 100644 index 00000000000..7ae3e011973 --- /dev/null +++ b/pkgs/applications/science/astronomy/siril/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitLab, fetchFromGitHub, pkg-config, meson, ninja, + git, criterion, wrapGAppsHook, gtk3, libconfig, gnuplot, opencv, + fftwFloat, cfitsio, gsl, exiv2, curl, librtprocess, ffmpeg, + libraw, libtiff, libpng, libjpeg, libheif, ffms +}: + +stdenv.mkDerivation rec { + pname = "siril"; + version = "0.99.6"; + + src = fetchFromGitLab { + owner = "free-astro"; + repo = pname; + rev = version; + sha256 = "06vh8x45gv0gwlnqjwxglf12jmpdaxkiv5sixkqh20420wabx3ha"; + }; + + nativeBuildInputs = [ + meson ninja pkg-config git criterion wrapGAppsHook + ]; + + buildInputs = [ + gtk3 cfitsio gsl exiv2 gnuplot curl opencv fftwFloat librtprocess + libconfig libraw libtiff libpng libjpeg libheif ffms ffmpeg + ]; + + # Necessary because project uses default build dir for flatpaks/snaps + dontUseMesonConfigure = true; + + configureScript = '' + ${meson}/bin/meson --buildtype release nixbld . + ''; + + postConfigure = '' + cd nixbld + ''; + + meta = with stdenv.lib; { + homepage = "https://www.siril.org/"; + description = "Astronomical image processing tool"; + license = licenses.gpl3; + maintainers = with maintainers; [ hjones2199 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dca91a3680c..ae2efd31be2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7269,6 +7269,8 @@ in sipsak = callPackage ../tools/networking/sipsak { }; + siril = callPackage ../applications/science/astronomy/siril { }; + sisco.lv2 = callPackage ../applications/audio/sisco.lv2 { }; sit = callPackage ../applications/version-management/sit { From 4f9da3341be7ec45de91ac919578574e928fe297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20G=C3=B6ttlinger?= Date: Fri, 11 Dec 2020 08:42:14 +0100 Subject: [PATCH 37/42] inboxer: remove (#105613) Co-authored-by: Sandro --- .../mailreaders/inboxer/default.nix | 87 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 89 deletions(-) delete mode 100644 pkgs/applications/networking/mailreaders/inboxer/default.nix diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix deleted file mode 100644 index 30ca6d6c7ec..00000000000 --- a/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ stdenv, fetchurl, binutils, patchelf, makeWrapper -, expat, xorg, gdk-pixbuf, glib, gnome2, cairo, atk, freetype, pango -, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }: - -stdenv.mkDerivation rec { - pname = "inboxer"; - version = "1.2.3"; - - meta = with stdenv.lib; { - description = "Unofficial, free and open-source Google Inbox Desktop App"; - homepage = "https://denysdovhan.com/inboxer"; - maintainers = [ maintainers.mgttlinger ]; - license = licenses.mit; - platforms = [ "x86_64-linux" ]; - }; - - src = fetchurl { - url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb"; - sha256 = "1ak8sr9sc0fkbrmfynxivbn9csrbyly4fhjlk7kx10aq8hk893a7"; - }; - - unpackPhase = '' - ar p $src data.tar.xz | tar xJ - ''; - nativeBuildInputs = [ patchelf makeWrapper ]; - buildInputs = [ binutils ]; - - preFixup = with stdenv.lib; let - lpath = makeLibraryPath [ - alsaLib - atk - cairo - cups - dbus - nss - nspr - freetype - fontconfig - gtk2-x11 - xorg.libX11 - xorg.libXcursor - xorg.libXdamage - xorg.libXi - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libXrender - xorg.libXcomposite - xorg.libXtst - xorg.libXScrnSaver - xorg.libxcb - gdk-pixbuf - glib - pango - gnome2.GConf - expat - stdenv.cc.cc.lib - libpulseaudio - udev - ]; - in '' - patchelf \ - --set-rpath "$out/opt/Inboxer:${lpath}" \ - $out/opt/Inboxer/libnode.so - patchelf \ - --set-rpath "$out/opt/Inboxer:${lpath}" \ - $out/opt/Inboxer/libffmpeg.so - - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/opt/Inboxer:${lpath}" \ - $out/opt/Inboxer/inboxer - - wrapProgram $out/opt/Inboxer/inboxer --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${lpath}" - ''; - - installPhase = '' - mkdir -p $out/bin - cp -R usr/share opt $out/ - # fix the path in the desktop file - substituteInPlace \ - $out/share/applications/inboxer.desktop \ - --replace /opt/ $out/opt/ - # symlink the binary to bin/ - ln -s $out/opt/Inboxer/inboxer $out/bin/inboxer - ''; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9ae697ef5a4..b99ab6eb32d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -226,6 +226,7 @@ mapAliases ({ icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21 icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21 idea = jetbrains; # added 2017-04-03 + inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped."; infiniband-diags = rdma-core; # added 2019-08-09 inotifyTools = inotify-tools; jasper = throw "jasper has been removed: abandoned upstream with many vulnerabilities"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4945eaae382..3381a664bc3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4820,8 +4820,6 @@ in inadyn = callPackage ../tools/networking/inadyn { }; - inboxer = callPackage ../applications/networking/mailreaders/inboxer { }; - incron = callPackage ../tools/system/incron { }; industrializer = callPackage ../applications/audio/industrializer { }; From 12d1b76db8449dd66db9dcbc1b4964aa58552448 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 30 Oct 2020 14:27:23 +0700 Subject: [PATCH 38/42] remarkable-toolchain: use which instead of patching with sed --- .../remarkable-toolchain/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix b/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix index 412830369b9..d259721353b 100644 --- a/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix +++ b/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libarchive, python3, file }: +{ stdenv, fetchurl, libarchive, python, file, which }: stdenv.mkDerivation rec { pname = "remarkable-toolchain"; @@ -6,31 +6,30 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://remarkable.engineering/oecore-x86_64-cortexa9hf-neon-toolchain-zero-gravitas-${version}.sh"; - sha256 = "6299955721bcd9bef92a87ad3cfe4d31df8e2da95b0c4b2cdded4431aa6748b0"; + sha256 = "1rk1r80m5d18sw6hrybj6f78s8pna0wrsa40ax6j8jzfwahgzmfb"; + executable = true; }; nativeBuildInputs = [ libarchive - python3 + python file + which ]; - unpackCmd = "mkdir src; install $curSrc src/install-toolchain.sh"; - + dontUnpack = true; dontBuild = true; installPhase = '' - patchShebangs install-toolchain.sh - sed -i -e '3,9d' install-toolchain.sh # breaks PATH - sed -i 's|PYTHON=.*$|PYTHON=${python3}/bin/python|' install-toolchain.sh - ./install-toolchain.sh -D -y -d $out + mkdir -p $out + ENVCLEANED=1 $src -y -d $out ''; meta = with stdenv.lib; { description = "A toolchain for cross-compiling to reMarkable tablets"; homepage = "https://remarkable.engineering/"; license = licenses.gpl2; - maintainers = [ maintainers.nickhu ]; - platforms = platforms.x86_64; + maintainers = with maintainers; [ nickhu siraben ]; + platforms = [ "x86_64-linux" ]; }; } From aa995fb0b7c75c53e2a5392ea49ee1e0474294b1 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 26 Nov 2020 15:16:51 +0800 Subject: [PATCH 39/42] nixos/sshguard: do not do IPv6 setup/teardown unconditionally --- nixos/modules/services/security/sshguard.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix index e7a9cefdef3..72de11a9254 100644 --- a/nixos/modules/services/security/sshguard.nix +++ b/nixos/modules/services/security/sshguard.nix @@ -119,15 +119,17 @@ in { # firewall rules before sshguard starts. preStart = optionalString config.networking.firewall.enable '' ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard4 hash:net family inet - ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard6 hash:net family inet6 ${pkgs.iptables}/bin/iptables -I INPUT -m set --match-set sshguard4 src -j DROP + '' + optionalString (config.networking.firewall.enable && config.networking.enableIPv6) '' + ${pkgs.ipset}/bin/ipset -quiet create -exist sshguard6 hash:net family inet6 ${pkgs.iptables}/bin/ip6tables -I INPUT -m set --match-set sshguard6 src -j DROP ''; postStop = optionalString config.networking.firewall.enable '' ${pkgs.iptables}/bin/iptables -D INPUT -m set --match-set sshguard4 src -j DROP - ${pkgs.iptables}/bin/ip6tables -D INPUT -m set --match-set sshguard6 src -j DROP ${pkgs.ipset}/bin/ipset -quiet destroy sshguard4 + '' + optionalString (config.networking.firewall.enable && config.networking.enableIPv6) '' + ${pkgs.iptables}/bin/ip6tables -D INPUT -m set --match-set sshguard6 src -j DROP ${pkgs.ipset}/bin/ipset -quiet destroy sshguard6 ''; From 348eb9083eedf36661f6551f8379585561c3b55e Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Fri, 11 Dec 2020 08:32:03 +0000 Subject: [PATCH 40/42] go-ethereum: 1.9.24 -> 1.9.25 --- pkgs/applications/blockchains/go-ethereum.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index b0f464cbfdc..24f58a6c2c3 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.24"; + version = "1.9.25"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0nrx5fwfij9wajd3lj76hh1yv4zg4q3jc76a76m22djn1njl0n5j"; + sha256 = "0cbgqs17agwdap4g37sb2g6mhyn7qkqbjk7kwb5jvj8nbi5n3kbd"; }; runVend = true; - vendorSha256 = "1qbg44cryiv9kvcak6qjrbmkc9bxyk5fybj62vdkskqfjvv86068"; + vendorSha256 = "08wgah8gxb5bscm5ca6zkfgssnmw2y2l6k9gfw7gbxyflsx74lya"; doCheck = false; From c8dd31a60b29c8ef20f2fb49b7178e64fd336ff9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 11 Dec 2020 10:43:04 +0100 Subject: [PATCH 41/42] signal-desktop: 1.38.2 -> 1.39.2 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 84f09022862..05d94b2ef71 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.38.2"; # Please backport all updates to the stable channel. + version = "1.39.2"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1lq830760y4kmhqd29hhgnab6lryiipb01y0c5bbl886zk3z35n4"; + sha256 = "15lv8jpnn2cx7hmb7pn32cvq6nqvzjflf77bbnvxva5hf9zjkma9"; }; nativeBuildInputs = [ From 397a5ee2eee934a768482b2eee13b698ab95f8f8 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 11 Dec 2020 10:53:33 +0100 Subject: [PATCH 42/42] chromiumDev: 89.0.4343.0 -> 89.0.4350.4 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 23c92b2c088..3b64e601eba 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "89.0.4343.0", - "sha256": "0jmc1l0lysl5zax98fjhzsfq3c1sqh3n3xscidafflx362wcfpwa", - "sha256bin64": "1v6xik8kf531y0g5xj0c8szjmak0qvh77kwkw7p7hqxqmnwwp06d", + "version": "89.0.4350.4", + "sha256": "1jh3r227j70imjzj0gm7cf1mv25zcdd2waa9qvim0p3g6wbdacmq", + "sha256bin64": "06963r7a1xc9vjlwgn0wgzqfj6mavfks20lzf49axw6izrxf8sbr", "deps": { "gn": { "version": "2020-11-05",