From 4224476df6643dd50982a393534f1c3f22d8a1c0 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Mon, 28 Dec 2020 20:00:37 +0100 Subject: [PATCH 01/81] kmod: fix kmod tools crash on darwin include the proper header for basename(), otherwise the returned pointer is truncated to 32 bit because an int return type is assumed --- pkgs/os-specific/linux/kmod/darwin.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/os-specific/linux/kmod/darwin.patch b/pkgs/os-specific/linux/kmod/darwin.patch index 69dbf479f9f..e112e691525 100644 --- a/pkgs/os-specific/linux/kmod/darwin.patch +++ b/pkgs/os-specific/linux/kmod/darwin.patch @@ -121,3 +121,15 @@ index fd2028d..ecb0141 100644 if (!cwd) return NULL; +--- a/shared/util.h 2018-01-31 18:10:59.000000000 +0100 ++++ b/shared/util.h 2020-12-28 19:48:21.000000000 +0100 +@@ -7,6 +7,9 @@ + #include + #include + #include ++#ifdef __APPLE__ ++#include ++#endif + + #include + From a0c8966fb3029860e88cf2cdfa4bcbf100ad3223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Thu, 28 Jan 2021 11:28:07 +0100 Subject: [PATCH 02/81] giara: init at 0.3 --- .../applications/networking/giara/default.nix | 68 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/applications/networking/giara/default.nix diff --git a/pkgs/applications/networking/giara/default.nix b/pkgs/applications/networking/giara/default.nix new file mode 100644 index 00000000000..940756855b9 --- /dev/null +++ b/pkgs/applications/networking/giara/default.nix @@ -0,0 +1,68 @@ +{ lib +, fetchFromGitLab +, meson +, gobject-introspection +, pkg-config +, ninja +, python3 +, wrapGAppsHook +, gtk3 +, gdk-pixbuf +, webkitgtk +, gtksourceview4 +, libhandy +, glib-networking +}: + +python3.pkgs.buildPythonApplication rec { + pname = "giara"; + version = "0.3"; + + format = "other"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = pname; + rev = version; + sha256 = "004qmkfrgd37axv0b6hfh6v7nx4pvy987k5yv4bmlmkj9sbqm6f9"; + }; + + nativeBuildInputs = [ + meson + gobject-introspection + pkg-config + ninja + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + gdk-pixbuf + webkitgtk + gtksourceview4 + libhandy + glib-networking + ]; + + pythonPath = with python3.pkgs; [ + pygobject3 + pycairo + dateutil + praw + pillow + mistune + beautifulsoup4 + ]; + + # Fix setup-hooks https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + + meta = with lib; { + description = "A Reddit app, built with Python, GTK and Handy; Created with mobile Linux in mind"; + maintainers = with maintainers; [ dasj19 ]; + homepage = "https://gitlab.gnome.org/World/giara"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb0730d57d9..46dbc02d881 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22345,6 +22345,8 @@ in giada = callPackage ../applications/audio/giada {}; + giara = callPackage ../applications/networking/giara { }; + gitit = callPackage ../applications/misc/gitit {}; gkrellm = callPackage ../applications/misc/gkrellm { From 6dd40fcf51a41c0483a9171e4898cf50fbe4926b Mon Sep 17 00:00:00 2001 From: James Ottaway Date: Tue, 28 Apr 2020 21:58:35 +1000 Subject: [PATCH 03/81] dotnetCorePackages: Fix `combinePackages` example --- pkgs/development/compilers/dotnet/combine-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index 00fb7c6d9b4..a38d44e37ef 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -4,9 +4,9 @@ let cli = builtins.head packages; in assert lib.assertMsg ((builtins.length packages) != 0) ''You must include at least one package, e.g - `with dotnetCorePackages; combinePackages { - packages = [ sdk_3_0 aspnetcore_2_1 ]; - };`'' ; + `with dotnetCorePackages; combinePackages [ + sdk_3_0 aspnetcore_2_1 + ];`'' ; buildEnv { name = "dotnet-core-combined"; paths = packages; From e187ea500459f6b1601254ca073316b095c917e7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 29 Jan 2021 12:29:17 +0000 Subject: [PATCH 04/81] pony-corral: 0.4.0 -> 0.4.1 --- pkgs/development/compilers/ponyc/pony-corral.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ponyc/pony-corral.nix b/pkgs/development/compilers/ponyc/pony-corral.nix index 5da1ec77016..8910d7f1e61 100644 --- a/pkgs/development/compilers/ponyc/pony-corral.nix +++ b/pkgs/development/compilers/ponyc/pony-corral.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation ( rec { pname = "corral"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "0kydx4psl6k4n46as9xc5xwbwapibm6g7haxds7y9d392807qfqk"; + sha256 = "sha256-YJZ1jGMOeZKGZaTrWO2mtR94F0voC2DXaghi0LytF7I="; }; buildInputs = [ ponyc ]; From 81f3b062992ec9103331920039c0eb96d95ac757 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 17 Feb 2021 23:50:49 +0000 Subject: [PATCH 05/81] python37Packages.arrayqueues: 1.2.0b0 -> 1.3.1 --- pkgs/development/python-modules/arrayqueues/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/arrayqueues/default.nix b/pkgs/development/python-modules/arrayqueues/default.nix index 82c8fc93267..79a44ad42cd 100644 --- a/pkgs/development/python-modules/arrayqueues/default.nix +++ b/pkgs/development/python-modules/arrayqueues/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "arrayqueues"; - version = "1.2.0b0"; + version = "1.3.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1gvrxb2rw0dk469wq5azylar7hhanfp07gl5mc6ajdbgz9gsd6ln"; + sha256 = "a955df768e39d459de28c7ea10ee02f67b1c70996cfa229846ab98df77a6fb69"; }; propagatedBuildInputs = [ From 1d3fb83d7197bcdbd54f09a3e3ad17611fbe2125 Mon Sep 17 00:00:00 2001 From: joachimschmidt557 Date: Wed, 24 Feb 2021 00:21:13 +0100 Subject: [PATCH 06/81] ytcc: 2.0.1 -> 2.1.0 --- pkgs/tools/networking/ytcc/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix index 75cf8403d93..4c5fae8829f 100644 --- a/pkgs/tools/networking/ytcc/default.nix +++ b/pkgs/tools/networking/ytcc/default.nix @@ -2,18 +2,25 @@ python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "woefe"; repo = "ytcc"; rev = "v${version}"; - sha256 = "11gwpqmq611j07pjscch28jsrfgyzy69ph2w1miz3arqmxz7dqjp"; + sha256 = "04l5bfyq53r8803q24bfw49ji7jx8z9irhhh30cvq2va1ywwd4ww"; }; nativeBuildInputs = [ gettext ]; - propagatedBuildInputs = with python3Packages; [ click feedparser lxml sqlalchemy youtube-dl ]; + propagatedBuildInputs = with python3Packages; [ + click + feedparser + lxml + sqlalchemy + youtube-dl + wcwidth + ]; checkInputs = with python3Packages; [ nose pytestCheckHook ]; @@ -24,6 +31,11 @@ python3Packages.buildPythonApplication rec { "download_videos" "update_all" "add_channel_duplicate" + "test_subscribe" + "test_import" + "test_import_duplicate" + "test_update" + "test_download" ]; meta = { From d201c8631edca0f9566cfd7d97fcd7a1158b560e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 28 Feb 2021 16:55:53 +0000 Subject: [PATCH 07/81] apt-cacher-ng: 3.6 -> 3.6.1 --- pkgs/servers/http/apt-cacher-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index 72c6286af3f..4ed03450af7 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "apt-cacher-ng"; - version = "3.6"; + version = "3.6.1"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; - sha256 = "sha256-/4jA5acNpHpdQ9kb/1A9thtoUCqsYFxSCr4JLmFYdt4="; + sha256 = "sha256-avyjp4KH7l6OZxnMVDv1U/MIWcadqyPPtnLYzEYkqlA="; }; nativeBuildInputs = [ cmake doxygen pkg-config ]; From 1204f0904f8a216279306e1ee9d6140ad32f98f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Mar 2021 04:26:09 +0000 Subject: [PATCH 08/81] python38Packages.elasticsearch: 7.10.1 -> 7.11.0 --- pkgs/development/python-modules/elasticsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 9161525c2bc..465e8f6c772 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.10.1"; + version = "7.11.0"; src = fetchPypi { inherit pname version; - sha256 = "a725dd923d349ca0652cf95d6ce23d952e2153740cf4ab6daf4a2d804feeed48"; + sha256 = "1e24b33a82bf381b42d3b0d390f76fdb9d6a9d47b310dea8eaeb0a5933c394c0"; }; # Check is disabled because running them destroy the content of the local cluster! From f6dda07f8a34c7ba31042a2b192074090ede2978 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Mar 2021 06:02:14 +0000 Subject: [PATCH 09/81] python37Packages.django-q: 1.3.4 -> 1.3.5 --- pkgs/development/python-modules/django-q/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix index 16b1e0bcc59..3d9d885daf7 100644 --- a/pkgs/development/python-modules/django-q/default.nix +++ b/pkgs/development/python-modules/django-q/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "django-q"; - version = "1.3.4"; + version = "1.3.5"; src = fetchPypi { inherit pname version; - sha256 = "523d54dcf1b66152c1b658f914f00ed3b518a3432a9decd4898738ca8dbbe10f"; + sha256 = "8871c602e2c7e892fbedc271d5b91c4a96803b689c3ee2f15464931f99f4e32b"; }; propagatedBuildInputs = [ From 4c3ad2c1fc2193a04a10e970beb23722d9fceba6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Mar 2021 20:26:21 +0000 Subject: [PATCH 10/81] conky: 1.11.6 -> 1.12.1 --- pkgs/os-specific/linux/conky/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 61b66c6c861..0e7eaa19b4d 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -68,13 +68,13 @@ with lib; stdenv.mkDerivation rec { pname = "conky"; - version = "1.11.6"; + version = "1.12.1"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - sha256 = "0y2g66fjqp2hdk0y1h4ijxhnv34j16gizvxpmbigwh4n6zijcm6v"; + sha256 = "sha256-qQx9+Z1OAQlbHupflzHD5JV4NqedoF8A57F1+rPT3/o="; }; postPatch = '' From 81969e3a7e45d2df87b588bc783aafe4afe96419 Mon Sep 17 00:00:00 2001 From: Tomas Bravo <66133083+tcbravo@users.noreply.github.com> Date: Wed, 3 Mar 2021 17:05:32 +0100 Subject: [PATCH 11/81] fetchgit: use git-lfs from buildPackages --- 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 2d2c4d349b5..f1581c75c27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -365,6 +365,7 @@ in fetchgit = callPackage ../build-support/fetchgit { git = buildPackages.gitMinimal; cacert = buildPackages.cacert; + git-lfs = buildPackages.git-lfs; }; fetchgitLocal = callPackage ../build-support/fetchgitlocal { }; From 7e16a5c16a526a26961ee3c77bec624085259bf2 Mon Sep 17 00:00:00 2001 From: bloomvdomino Date: Wed, 3 Mar 2021 17:45:10 +0100 Subject: [PATCH 12/81] kora-icon-theme: 1.4.1 -> 1.4.2 --- pkgs/data/icons/kora-icon-theme/default.nix | 14 +++++++++----- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix index 36aee979f0b..bdc7b55d9c2 100644 --- a/pkgs/data/icons/kora-icon-theme/default.nix +++ b/pkgs/data/icons/kora-icon-theme/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub , gtk3, breeze-icons, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub , gtk3, adwaita-icon-theme, breeze-icons, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "sha256-YGhusal8g/UXMqrQvj147OScg51uNABTMIXxVXvnpKY="; + sha256 = "1qnqz0h2c5kilch3308l8nfshgsrkllyysvqn0mxy70iziw895rv"; }; nativeBuildInputs = [ @@ -16,20 +16,24 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ + adwaita-icon-theme breeze-icons - gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; installPhase = '' + runHook preInstall + mkdir -p $out/share/icons mv kora* $out/share/icons/ for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme + gtk-update-icon-cache -f $theme done + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d2c4d349b5..369fcae814e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20672,6 +20672,7 @@ in kopia = callPackage ../tools/backup/kopia { }; kora-icon-theme = callPackage ../data/icons/kora-icon-theme { + inherit (gnome3) adwaita-icon-theme; inherit (libsForQt5.kdeFrameworks) breeze-icons; }; From 7ec939d517269a7fb3279714751d8918d9bfd506 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 4 Mar 2021 19:23:50 +0000 Subject: [PATCH 13/81] libreoffice-fresh: 7.1.0.3 -> 7.1.1.2 --- .../office/libreoffice/src-fresh/download.nix | 24 +++++++++---------- .../office/libreoffice/src-fresh/primary.nix | 10 ++++---- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index ea6fc1d777e..75c6b570471 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -476,11 +476,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2020-09-29.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-09-29.tar.bz2"; - sha256 = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f"; + name = "language-subtag-registry-2020-12-18.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-12-18.tar.bz2"; + sha256 = "62ce680d5db0f28001b64bd57db47f388c13629cdefc9af8e8af0fbe93689ba1"; md5 = ""; - md5name = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f-language-subtag-registry-2020-09-29.tar.bz2"; + md5name = "62ce680d5db0f28001b64bd57db47f388c13629cdefc9af8e8af0fbe93689ba1-language-subtag-registry-2020-12-18.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -546,11 +546,11 @@ md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { - name = "libnumbertext-1.0.6.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.6.tar.xz"; - sha256 = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57"; + name = "libnumbertext-1.0.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.7.tar.xz"; + sha256 = "17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc"; md5 = ""; - md5name = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57-libnumbertext-1.0.6.tar.xz"; + md5name = "17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc-libnumbertext-1.0.7.tar.xz"; } { name = "ltm-1.0.zip"; @@ -735,11 +735,11 @@ md5name = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3-poppler-21.01.0.tar.xz"; } { - name = "postgresql-9.2.24.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2"; - sha256 = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126"; + name = "postgresql-13.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.1.tar.bz2"; + sha256 = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f"; md5 = ""; - md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; + md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2"; } { name = "Python-3.8.4.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index 6fbc8c5cfc6..ab320f06785 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,8 +8,8 @@ rec { major = "7"; minor = "1"; - patch = "0"; - tweak = "3"; + patch = "1"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1rpk90g1g8m70nrj4lwkg50aiild73d29yjlgyrgg8wx6hzq7l4y"; + sha256 = "1vz028hzbc4n8jznigs419ygylz1vp426dprrkm62bzckv2p1rfn"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "0m6cxyrxig8akv9183xdn6ialmjddicn676149nm506yc5y0szmi"; + sha256 = "1vidv8077f394zn87b2ng1hsld0hgr1zb1p9lmjx0n9k7s7clavh"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "1kvsi28n8x3gxpiszxh84x05aw23i3z4id63pgw2s7mfclby52k9"; + sha256 = "14wn0lvvplsj194jdqqv184xx0adb4mm8bjflddvcqsl7xsfqx27"; }; } From 37beb88b48eaf4fe81239491baa851cea756e5c5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 4 Mar 2021 21:59:53 +0000 Subject: [PATCH 14/81] acme-client: 1.1.0 -> 1.2.0 --- pkgs/tools/networking/acme-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/acme-client/default.nix b/pkgs/tools/networking/acme-client/default.nix index 6de95b34e62..728fde4b1e4 100644 --- a/pkgs/tools/networking/acme-client/default.nix +++ b/pkgs/tools/networking/acme-client/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation rec { pname = "acme-client"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { url = "https://data.wolfsden.cz/sources/acme-client-${version}.tar.xz"; - sha256 = "sha256-AYI7WfRTb5R0/hDX5Iqkq5nrLZ4gQecAGObSajSA+vw="; + sha256 = "sha256-fRSYwQmyV0WapjUJNG0UGO/tUDNTGUraj/BWq/a1QTo="; }; nativeBuildInputs = [ pkg-config ]; From 00697bad7e10de589ebfbd0bf262078ffc6e503c Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sat, 6 Mar 2021 17:09:57 -0800 Subject: [PATCH 15/81] akvcam: 1.1.1 -> 1.2.0 --- pkgs/os-specific/linux/akvcam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix index 026ef5b0f46..815dc6a2ee3 100644 --- a/pkgs/os-specific/linux/akvcam/default.nix +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "akvcam"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "webcamoid"; repo = "akvcam"; rev = version; - sha256 = "ULEhfF+uC/NcVUGAtmP1+BnrcgRgftNS97nLp81avQ8="; + sha256 = "0r5xg7pz0wl6pq5029rpzm9fn978vq0md31xjkp2amny7rrgxw72"; }; nativeBuildInputs = [ qmake ]; From 2d632d08adc858574ca1d90f323e8608d1d556fb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 13:34:57 +0000 Subject: [PATCH 16/81] saga: 7.8.2 -> 7.9.0 --- pkgs/applications/gis/saga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 96c2e806682..c67abe1a743 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -32,11 +32,11 @@ mkDerivation rec { pname = "saga"; - version = "7.8.2"; + version = "7.9.0"; src = fetchurl { url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; - sha256 = "1008l8f4733vsxy3y6d1yg8m4h8pp65d2p48ljc9kp5nyrg5vfy5"; + sha256 = "sha256-ob23JbQnBxNO1QA8zUhLjgo5YBR90pwm8JT62bsPBdg="; }; nativeBuildInputs = [ From 1f91c33cb663ce0a8c96ddb9fa58843475d5f864 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 14:53:12 +0000 Subject: [PATCH 17/81] screen-message: 0.25 -> 0.26 --- pkgs/tools/X11/screen-message/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix index c1cef23a695..58bac8702b7 100644 --- a/pkgs/tools/X11/screen-message/default.nix +++ b/pkgs/tools/X11/screen-message/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "screen-message"; - version = "0.25"; + version = "0.26"; src = fetchurl { url = "mirror://debian/pool/main/s/screen-message/screen-message_${version}.orig.tar.gz"; - sha256 = "1lw955qq5pq010lzmaf32ylj2iprgsri9ih4hx672c3f794ilab0"; + sha256 = "sha256-vBKnuXOEQZDACmlNP9wjJ3NbIdixIx7I72a6Nj6pjzc="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From c590781d6eb4d7eccdc6c0f1fef6441a13aaf36c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 14:57:50 +0000 Subject: [PATCH 18/81] sabnzbd: 3.1.1 -> 3.2.0 --- pkgs/servers/sabnzbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 4533e3138a7..64a6dddfaa0 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -20,14 +20,14 @@ let ]); path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "3.1.1"; + version = "3.2.0"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0m39r2il7d014kf2p6v28lw2hzshm6bhhdchqa8wzyvvmygqmwf2"; + sha256 = "sha256-h+efFsyCqcMktKpKOqaHkfFdJKGAjvIOc6NmIyXnZDA="; }; nativeBuildInputs = [ makeWrapper ]; From 1316ac0145223059f6e13c58277b4ab18106b22a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 15:36:37 +0000 Subject: [PATCH 19/81] resolv_wrapper: 1.1.6 -> 1.1.7 --- pkgs/development/libraries/resolv_wrapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index 5b73bc41475..69ec0174748 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { - name = "resolv_wrapper-1.1.6"; + name = "resolv_wrapper-1.1.7"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "13k76l4s0v032xyyaf19qw6p4qc81ybx1wynkz2pzjhiljazsdpa"; + sha256 = "sha256-Rgrn/V5TSFvn3ZmlXFki8csWNrnoghmB1JrRZQfIoHQ="; }; nativeBuildInputs = [ cmake pkg-config ]; From a008b1491ace6f05ee10cc2343a9bd80fcfb8fc4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 16:17:36 +0000 Subject: [PATCH 20/81] smbnetfs: 0.6.2 -> 0.6.3 --- pkgs/tools/filesystems/smbnetfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index 98f8861699f..3bbff2903bc 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "smbnetfs"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${version}/${pname}-${version}.tar.bz2"; - sha256 = "19x9978k90w9a65lrpsphk7swsq8zkws9jc27q4zbndrm0r2snr0"; + sha256 = "sha256-6sN7l2n76cP0uvPrZMYaa1mtTyqgXf3culoaxK301WA="; }; nativeBuildInputs = [ pkg-config autoconf ]; From b1203f2adff61cb3f640374a4f249c66e53219a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 17:10:40 +0000 Subject: [PATCH 21/81] sofia_sip: 1.13.2 -> 1.13.3 --- pkgs/development/libraries/sofia-sip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index 1395f3e60cf..593bd87a982 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sofia-sip"; - version = "1.13.2"; + version = "1.13.3"; src = fetchFromGitHub { owner = "freeswitch"; repo = pname; rev = "v${version}"; - sha256 = "01xj30hhm1ji76igkqkn63rw42vvzq3azkr9qz6fy83iwqaybgyn"; + sha256 = "sha256-qMgZpLo/BHGJbJ0DDN8COHAhU3ujWgVK9oZOnnMwKas="; }; buildInputs = [ glib openssl ]; From a94ff1c2cc73c145e476e8bad2d1d71af40be9b9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 18:04:58 +0000 Subject: [PATCH 22/81] spoofer: 1.4.5 -> 1.4.6 --- pkgs/tools/networking/spoofer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix index a983ef9c42c..f5c8317d89b 100644 --- a/pkgs/tools/networking/spoofer/default.nix +++ b/pkgs/tools/networking/spoofer/default.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { pname = "spoofer"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { url = "https://www.caida.org/projects/spoofer/downloads/${pname}-${version}.tar.gz"; - sha256 = "0pnim3xyfsmv6alsvhwjs4v9lp39wwiyj63rxsqyz4wx4vkmn12z"; + sha256 = "sha256-+4FNC+rMxIoVXlW7HnBXUg0P4FhNvMTAqJ9c7lXQ6vE="; }; nativeBuildInputs = [ pkg-config ]; From adfbe67af985606194eff74ae9577477b3b3b8e9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 21:49:12 +0000 Subject: [PATCH 23/81] tixati: 2.74 -> 2.81 --- pkgs/applications/networking/p2p/tixati/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 3ceeb4b002e..d80165c4405 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tixati"; - version = "2.74"; + version = "2.81"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "1slsrqv97hnj1vxx3hw32dhqckbr05w622samjbrimh4dv8yrd29"; + sha256 = "sha256-qwKxlmE59V+rXtuYWBMwD1O7OO4gb36lN8syFyQ6uLc="; }; installPhase = '' From b721ddeec431348103d104d3245c016568633c3c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 22:58:36 +0000 Subject: [PATCH 24/81] tgt: 1.0.79 -> 1.0.80 --- pkgs/tools/networking/tgt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index 9ef0c9d46d1..ca40f9a7cb7 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tgt"; - version = "1.0.79"; + version = "1.0.80"; src = fetchFromGitHub { owner = "fujita"; repo = pname; rev = "v${version}"; - sha256 = "18bp7fcpv7879q3ppdxlqj7ayqmlh5zwrkz8gch6rq9lkmmrklrf"; + sha256 = "sha256-5qBqCHbkL6yw/iT2AtSumw8V0bV74TEyYMRgcPHW2lg="; }; nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ]; From a7dd3f0ad15d4494712d34f73a2e2c5952482dd6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Mar 2021 02:03:30 +0000 Subject: [PATCH 25/81] tclap: 1.2.2 -> 1.2.3 --- pkgs/development/libraries/tclap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix index 451f17a2cd7..feb3825b3d4 100644 --- a/pkgs/development/libraries/tclap/default.nix +++ b/pkgs/development/libraries/tclap/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tclap-1.2.2"; + name = "tclap-1.2.3"; src = fetchurl { url = "mirror://sourceforge/tclap/${name}.tar.gz"; - sha256 = "0dsqvsgzam3mypj2ladn6v1yjq9zd47p3lg21jx6kz5azkkkn0gm"; + sha256 = "sha256-GefbUoFUDxVDSHcLw6dIRXX09Umu+OAKq8yUs5X3c8k="; }; meta = with lib; { From 46b7ee4769e8412ee9999dde023b14d2267e1a4d Mon Sep 17 00:00:00 2001 From: ryneeverett Date: Mon, 11 Jan 2021 17:20:15 +0000 Subject: [PATCH 26/81] freetube: init at 0.12.0 --- pkgs/applications/video/freetube/default.nix | 50 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/applications/video/freetube/default.nix diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix new file mode 100644 index 00000000000..a5de2142d77 --- /dev/null +++ b/pkgs/applications/video/freetube/default.nix @@ -0,0 +1,50 @@ +{ stdenv, lib, fetchurl, appimageTools, makeWrapper, electron }: + +stdenv.mkDerivation rec { + pname = "freetube"; + version = "0.12.0"; + + src = fetchurl { + url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; + sha256 = "151fcm1swsasrwzm93fddx669q4xlfl3d58q1w58nyv7r6kh4fda"; + }; + + appimageContents = appimageTools.extractType2 { + name = "${pname}-${version}"; + inherit src; + }; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/${pname} $out/share/applications + + cp -a ${appimageContents}/{locales,resources} $out/share/${pname} + cp -a ${appimageContents}/freetube.desktop $out/share/applications/${pname}.desktop + cp -a ${appimageContents}/usr/share/icons $out/share + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/resources/app.asar + ''; + + meta = with lib; { + description = "An Open Source YouTube app for privacy"; + homepage = "https://freetubeapp.io/"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ ryneeverett ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19d5b9260f6..d2cedb66926 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4134,6 +4134,8 @@ in freetds = callPackage ../development/libraries/freetds { }; + freetube = callPackage ../applications/video/freetube { }; + freqtweak = callPackage ../applications/audio/freqtweak { wxGTK = wxGTK31-gtk2; }; From 6dc1177c241e953f1689c792f40a5f50a7961cd8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Mar 2021 03:37:07 +0000 Subject: [PATCH 27/81] wxmaxima: 20.06.6 -> 21.02.0 --- pkgs/applications/science/math/wxmaxima/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 89bdc415548..25215d7abb5 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wxmaxima"; - version = "20.06.6"; + version = "21.02.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "054f7n5kx75ng5j20rd5q27n9xxk03mrd7sbxyym1lsswzimqh4w"; + sha256 = "sha256-5nvaaKsvSEs7QxOszjDK1Xkana2er1BCMZ83b1JZSqc="; }; buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ]; From e4cbc8305feca686c4e4e224eac851cb3982ca81 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Mar 2021 07:33:13 +0000 Subject: [PATCH 28/81] victoriametrics: 1.52.0 -> 1.54.1 --- pkgs/servers/nosql/victoriametrics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 02fd7631518..d7612d30764 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.52.0"; + version = "1.54.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1sqzpr48sylgiy4zaf3f8hnwzv7imf57bxg6sin9lv291ybhxs68"; + sha256 = "sha256-nZSNn1vLk3y6s4ie1AkSkGmKUiIrcBr3yKW5uAEtRt0="; }; vendorSha256 = null; From 0497d984c9e0ef6945ab1cb473f0cefc0035d7a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Mar 2021 08:23:04 +0000 Subject: [PATCH 29/81] zita-resampler: 1.6.2 -> 1.8.0 --- pkgs/development/libraries/audio/zita-resampler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index 88e81d733b3..3b3c005a015 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "zita-resampler"; - version = "1.6.2"; + version = "1.8.0"; src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1my5k2dh2dkvjp6xjnf9qy6i7s28z13kw1n9pwa4a2cpwbzawfr3"; + sha256 = "sha256-5XRPI8VN0Vs/eDpoe9h57uKmkKRUWhW0nEzwN6pGSqI="; }; makeFlags = [ From ae7b72890ca3183029673cc0fc180bb83c42e08b Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Wed, 10 Mar 2021 11:36:21 +0100 Subject: [PATCH 30/81] plex: 1.21.4.4079-1b7748a7b -> 1.22.0.4163-d8c4875dd --- pkgs/servers/plex/raw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index dff8c4f9462..2b27c414c8f 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.21.4.4079-1b7748a7b"; + version = "1.22.0.4163-d8c4875dd"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0843sdl9c6382vjj3ykvcl6rizs2jnb4jqx19ah3phbcvsnjlhdb"; + sha256 = "16lwcimgnpxcyxbk4qwkqz5mzmizqfzihwqb41awc38qlfbjzh5g"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "02v4jf6jajm5gvsilllln1vvnxx30gi2b8ljsby5d3xhhca6kmqx"; + sha256 = "0wvqrn7mycrx0rn4zkp6cr2mr59nfqh63czm0awsfpqc6hqggz8y"; }; outputs = [ "out" "basedb" ]; From 619a191889226545330b318ef8d5f04536f692a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Mar 2021 18:28:45 +0000 Subject: [PATCH 31/81] cargo-deny: 0.8.8 -> 0.8.9 --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index b328f32dc26..1225d78d71e 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.8.8"; + version = "0.8.9"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "sha256-8wmH9DeI+tm3c/6n7bwMe5SslGNCUg4d5BE0+wQ7KTU="; + sha256 = "sha256-K8lNo2XmHzgbaVCMNvwDwr86hrXBPws9v3HD8ku+D6w="; }; - cargoSha256 = "sha256-f0Wisel7NQOyfbhhs0GwyTBiUfydPMSVAysrov/RxxI="; + cargoSha256 = "sha256-spTy9vzldzqu66904wRVwAeH1rNOQ3WeC6miJkRiAGg="; doCheck = false; From fea9710ec271c818e6feb2a47cb51c3bc7b04815 Mon Sep 17 00:00:00 2001 From: mingmingrr Date: Fri, 5 Mar 2021 01:35:58 -0500 Subject: [PATCH 32/81] pythonPackages.hydrus: 426 -> 431 --- pkgs/applications/graphics/hydrus/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index f5b8b806215..365dbb66b65 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -8,16 +8,16 @@ , pythonPackages }: -pythonPackages.buildPythonPackage { +pythonPackages.buildPythonPackage rec { pname = "hydrus"; - version = "426"; + version = "431"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; - rev = "1acdc258e5bb2ae22f5eafaf3dac8d9265dba5e2"; - sha256 = "1snihd433hx36s6d5hsnq4qg0xs6ag4822lwm5fqak64n22ad2qb"; + rev = "v${version}"; + sha256 = "0mfql27n725k6ynvhkgzmxxpfbjlzil2fjpy082gz257kb0880zy"; }; nativeBuildInputs = [ @@ -44,6 +44,7 @@ pythonPackages.buildPythonPackage { matplotlib qtpy pyside2 + mpv ]; checkInputs = with pythonPackages; [ nose httmock ]; From 549f11b944ec970998cecb2cd7c08b138299081d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Mar 2021 23:50:09 +0000 Subject: [PATCH 33/81] helmsman: 3.6.4 -> 3.6.5 --- pkgs/applications/networking/cluster/helmsman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index ccfeb6ed87a..32ecc8b7c17 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmsman"; - version = "3.6.4"; + version = "3.6.5"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-4oJ/undqDSNn+Xn8eFEgOx+7263tmdXTHxXBkyFLpsE="; + sha256 = "sha256-FOBSGXVIb4mLDHMqOljZ04W0q/H/HOuFm9Cl2kK027s="; }; vendorSha256 = "sha256-mktq5Dnk1mBO2yy5SeMDxa/akXdO5i2WafMTGtH53H8="; From fdf94550349061f4f49ea2d3c3cce3d6ae4eb8d1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Mar 2021 04:28:21 +0000 Subject: [PATCH 34/81] aws-c-event-stream: 0.2.6 -> 0.2.7 --- pkgs/development/libraries/aws-c-event-stream/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix index 18dddee6bde..b6468a8dae0 100644 --- a/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-event-stream"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "1hbri4dv924ph3cxkmwkl4kdca4dvhc9qda60rdzs6355l76k23n"; + sha256 = "sha256-8Du9Ib3MhPcgetBIi0k1NboaXxZh7iPNhDe7197JnHc="; }; nativeBuildInputs = [ cmake ]; From c9e45d7ce08d498e0e2811145846547be1143f5a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Mar 2021 06:10:41 +0000 Subject: [PATCH 35/81] boca: 1.0.3 -> 1.0.4 --- pkgs/development/libraries/boca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/boca/default.nix b/pkgs/development/libraries/boca/default.nix index a23acdbdc8a..0f848e30240 100644 --- a/pkgs/development/libraries/boca/default.nix +++ b/pkgs/development/libraries/boca/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "BoCA"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "enzo1982"; repo = "boca"; rev = "v${version}"; - sha256 = "0x6pqd5cdag0l283lkq01qaqwyf1skxbncdwig8b2s742nbzjlz8"; + sha256 = "sha256-SP/rVt/8VoeUprwJIIMSIBvoC1Zein3F7MR2tqc2vd0="; }; nativeBuildInputs = [ From fb42b9f4eda3c839136e58920b6680a3e5279a48 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Mar 2021 08:10:27 +0000 Subject: [PATCH 36/81] cargo-audit: 0.13.1 -> 0.14.0 --- pkgs/tools/package-management/cargo-audit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix index df492863a14..12bf27165f7 100644 --- a/pkgs/tools/package-management/cargo-audit/default.nix +++ b/pkgs/tools/package-management/cargo-audit/default.nix @@ -1,16 +1,16 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "RustSec"; repo = "cargo-audit"; rev = "v${version}"; - sha256 = "1q8i2c3f8ir1pxkvla4dshz7n0cl97mjydc64xis5pph39f69yc1"; + sha256 = "sha256-w3wKUAAp9z4iQbx16z5chpKHYxCDLZzJesnIct2Qy4g="; }; - cargoSha256 = "1b62mcj4gjz2arjf3r30k9qcg81i5x0149a4bfj39xdrz55gg0wh"; + cargoSha256 = "sha256-ychF3qbwEjumLyqc+xDI8bbKzvdoRYF/X/idlk+JxDE="; buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; From 0bcaa16dd4e21270e2d39af826962e92a9c90648 Mon Sep 17 00:00:00 2001 From: Lana Black Date: Thu, 11 Mar 2021 08:51:54 +0000 Subject: [PATCH 37/81] atom: Add global menu support --- pkgs/applications/editors/atom/env.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index 5e3c1070ad2..3c0f348ebd5 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,7 +1,7 @@ { stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr , gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk -, at-spi2-core +, at-spi2-core, libdbusmenu }: let @@ -11,7 +11,7 @@ let xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify - xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core + xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core libdbusmenu ]; libPathNative = lib.makeLibraryPath packages; From 63b71c7ecf3d7c64d64c0a98a211ec9c1c377183 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Mar 2021 13:52:59 +0000 Subject: [PATCH 38/81] python38Packages.hg-evolve: 10.1.0 -> 10.2.0.post1 --- pkgs/development/python-modules/hg-evolve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 38a770e879f..4c74621b483 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.1.0"; + version = "10.2.0.post1"; src = fetchPypi { inherit pname version; - sha256 = "a386e6ee2d9a0e332a49f1cb210c4c11ba9844bcd52808270f48e688314783d8"; + sha256 = "391aa877a61ed04c58b8d82d465b3771f632bb9b19f22cbf18f0e5a1f42f8d4e"; }; doCheck = false; From 4cf6284371b98f03bd1307e4809f18aa28d9d051 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Fri, 12 Mar 2021 08:56:30 +0100 Subject: [PATCH 39/81] dnsviz: 0.9.2 -> 0.9.3 --- pkgs/tools/networking/dnsviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsviz/default.nix b/pkgs/tools/networking/dnsviz/default.nix index 1f33855017d..ba31aba8d6c 100644 --- a/pkgs/tools/networking/dnsviz/default.nix +++ b/pkgs/tools/networking/dnsviz/default.nix @@ -8,13 +8,13 @@ buildPythonApplication rec { pname = "dnsviz"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "dnsviz"; repo = "dnsviz"; rev = "v${version}"; - sha256 = "sha256-tIxjlNtncZJSdfQelIR9fTohBDkyC0+YwEcs2gNfKec="; + sha256 = "sha256-QsTYpNaAJiIRUrr2JYjXWOKFihENhAccvmB/DRhX1PA="; }; patches = [ From 5b127bca6a4f59fa96b7dd219f58d2f2eed81150 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Mar 2021 16:25:47 +0000 Subject: [PATCH 40/81] python38Packages.django-auth-ldap: 2.2.0 -> 2.3.0 --- pkgs/development/python-modules/django-auth-ldap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index 2271be1d16f..d89bc6023c6 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-auth-ldap"; - version = "2.2.0"; + version = "2.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "11af1773b08613339d2c3a0cec1308a4d563518f17b1719c3759994d0b4d04bf"; + sha256 = "5894317122a086c9955ed366562869a81459cf6b663636b152857bb5d3a0a3b7"; }; propagatedBuildInputs = [ ldap django ]; From 4ca56529427d73a68f813a3c30ee64c2c4642439 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Mar 2021 16:29:12 +0000 Subject: [PATCH 41/81] python38Packages.dbf: 0.99.0 -> 0.99.1 --- pkgs/development/python-modules/dbf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index 18560734bd8..b5b6f277fd6 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dbf"; - version = "0.99.0"; + version = "0.99.1"; src = fetchPypi { inherit pname version; - sha256 = "a4a7a8cdc113d840142d21a796c16c7d329ad35c48f17156446732c83ebc571a"; + sha256 = "4ed598a3866dfe7761b8099cf53ab44cb6ed5e4a7dbffb0da8c67a4af8d62fc5"; }; propagatedBuildInputs = [ aenum ] ++ lib.optional (pythonOlder "3.4") enum34; From 3d91abbbbdf0e77655adccea8722a440e5d053a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Mar 2021 17:07:00 +0000 Subject: [PATCH 42/81] python38Packages.django_contrib_comments: 2.0.0 -> 2.1.0 --- .../python-modules/django_contrib_comments/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django_contrib_comments/default.nix index a452db3cf28..3f717b0fb5c 100644 --- a/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/pkgs/development/python-modules/django_contrib_comments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-contrib-comments"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "26350b2c353816570a74b7fb19c558ce00288625ac32886a5274f4f931c098f9"; + sha256 = "d82f1d04690550df026553053903deec0c52dc54212e1b79241b08f0355cff2c"; }; propagatedBuildInputs = [ django ]; From c8c4e408dd8d9a9d68faa0a259704ee2e951d9f9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Mar 2021 20:45:19 +0000 Subject: [PATCH 43/81] python38Packages.WSME: 0.10.0 -> 0.10.1 --- pkgs/development/python-modules/WSME/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix index 50e90ded762..118288acb59 100644 --- a/pkgs/development/python-modules/WSME/default.nix +++ b/pkgs/development/python-modules/WSME/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "WSME"; - version = "0.10.0"; + version = "0.10.1"; disabled = pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; - sha256 = "965b9ce48161e5c50d84aedcf50dca698f05bf07e9d489201bccaec3141cd304"; + sha256 = "34209b623635a905bcdbc654f53ac814d038da65e4c2bc070ea1745021984079"; }; nativeBuildInputs = [ pbr ]; From 2fbf9bc7e4bea39248f235add5540ec2d52c121f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Mar 2021 22:08:01 +0000 Subject: [PATCH 44/81] python38Packages.zc_buildout_nix: 2.13.3 -> 2.13.4 --- pkgs/development/python-modules/buildout-nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index 7f7afd67e7e..834dd42bc08 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.13.3"; + version = "2.13.4"; src = fetchPypi { inherit pname version; - sha256 = "1dyc5g3yv7wm3hf3fcsh6y1wivzjj1bspafr5qqb653z9a31lsfn"; + sha256 = "b978b2f9317b317ee4191f78fcc4f05b1ac41bdaaae47f0956f14c8285feef63"; }; patches = [ ./nix.patch ]; From fddb829150089318ee4a1d33d7b11468c5919b1c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Mar 2021 02:43:35 +0000 Subject: [PATCH 45/81] buildkite-cli: 1.1.0 -> 1.2.0 --- .../tools/continuous-integration/buildkite-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix index aee2a4e2341..73aefdd0cda 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "buildkite-cli"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "cli"; rev = "v${version}"; - sha256 = "05hz59qzadkk4ji5icv5sxih31pnn0abnmiwcyfa2mr3l5jaqjnd"; + sha256 = "sha256-AIa+hEYtPJ4CFvAFSpNJFxY+B3+DJH1Q0hL/3BD/yN0="; }; - vendorSha256 = "0jxh3yhh0sdvaykhinxngpipk369hw8z1y3g2z4c1115m5rjp2bb"; + vendorSha256 = "sha256-4AH9PZWSrBXi9w4Mr7dpXqDkQZGzuELG876YCaFTj2Q="; doCheck = false; From d6b385c2735dc2171026e2ac6886ac7a2dc72e68 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Mar 2021 07:55:32 +0000 Subject: [PATCH 46/81] kustomize-sops: 2.4.0 -> 2.5.0 --- pkgs/development/tools/kustomize/kustomize-sops.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index 4c8693b0e51..e073c4f2e9e 100644 --- a/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "0sr4d7amwn62xywwn83y58ynl8xv6l1q6zwbky5rmy0qxk909bqp"; + sha256 = "sha256-aJGYkWMMg26V/T5BcWo3ibtHJBm4g2iIQn8cxs105Ys="; }; - vendorSha256 = "0vn6vrczbdln7ngz061xixjwn899jn7p2a46770xqx44bh3f2lgv"; + vendorSha256 = "sha256-6yfsGGzdUQySyQNuB58gwbsMjJgtUhfgfPI2zYlyUQo="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ From 6f206e5cf8a07471da828c67a22fffda29d56fbe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Mar 2021 11:50:58 +0000 Subject: [PATCH 47/81] qbec: 0.13.4 -> 0.14.1 --- pkgs/applications/networking/cluster/qbec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index a4f15586ad0..485eba2721d 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "qbec"; - version = "0.13.4"; + version = "0.14.1"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "sha256-jbGEkBBXb1dDv4E7vEPVyvDahz27Kpyo3taenCH/vfw="; + sha256 = "sha256-+CzY/ifH+U3I36uHXyO2FSkPCz+SWRpSPnxfd2LHHhY="; }; - vendorSha256 = "sha256-rzxtLaGUl8hxcJ+GWlrkjN+f7mb0lXrtkHj/pBO8HzQ="; + vendorSha256 = "sha256-wtpXqIixjRYYSIPe43Q5627g6mu05WdvwCi9cXVgCBs="; doCheck = false; From a802441cd18e3069f0478eab47e10e9ee3d743af Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Mar 2021 13:09:39 +0000 Subject: [PATCH 48/81] sameboy: 0.14.1 -> 0.14.2 --- pkgs/misc/emulators/sameboy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/sameboy/default.nix b/pkgs/misc/emulators/sameboy/default.nix index 6b209840169..ee91a010df7 100644 --- a/pkgs/misc/emulators/sameboy/default.nix +++ b/pkgs/misc/emulators/sameboy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sameboy"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "LIJI32"; repo = "SameBoy"; rev = "v${version}"; - sha256 = "0h42cixbf0m2qiwrqzygh0x166h9ikxa5dzi3jbqld2dygk932n7"; + sha256 = "sha256-VGyB0Em9VFU1Z1K2XfbS9wGs6gZ8/eH/FiaFAKnFdaA="; }; enableParallelBuilding = true; From 344751ebe56c46ab68eb4b4b506cb9bcbd5d4197 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Mar 2021 13:46:03 +0000 Subject: [PATCH 49/81] sickgear: 0.23.11 -> 0.23.14 --- pkgs/servers/sickbeard/sickgear.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index ae0ae2e3eea..ff464c62824 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.23.11"; + version = "0.23.14"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "sha256-1VUW8WBNlGSL9JpKhpYfAgCFp3ZGYgWFXTehOAueuZI="; + sha256 = "sha256-QhBdOXu+KizeSYHUbNflDaDpzjeEFaYkhY+K1MgLzzc="; }; dontBuild = true; From 3ff39c40df0dce44bd66cd6a7ba5a1321b7eab72 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Mar 2021 14:24:03 +0000 Subject: [PATCH 50/81] stripe-cli: 1.5.9 -> 1.5.10 --- pkgs/tools/admin/stripe-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index 3d91847a9a6..347a936c3a9 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.5.9"; + version = "1.5.10"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fR4MFEytYZA4zt4WFGnEp9YDCtX6peQoI+NynqyReT8="; + sha256 = "sha256-cedreUdLjUONA8iVlQ/OfOJtM8EgCI8zaKDCbruUIVo="; }; - vendorSha256 = "sha256-GQACtHTid1Aq5iSQqks10hmGS+VUlwNoM1LG+liynhU="; + vendorSha256 = "sha256-hYvW5xAbnxOEapFc70wOF9ybbDv7hLGljKqHI+1Itaw="; subPackages = [ "cmd/stripe" From a7e2baebaaf6e46e1cc3c5a48d2d198557e1ab9a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Mar 2021 14:36:50 +0000 Subject: [PATCH 51/81] svlint: 0.4.16 -> 0.4.18 --- pkgs/development/tools/analysis/svlint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix index 3455d78b23f..a562a1baeee 100644 --- a/pkgs/development/tools/analysis/svlint/default.nix +++ b/pkgs/development/tools/analysis/svlint/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.4.16"; + version = "0.4.18"; src = fetchFromGitHub { owner = "dalance"; repo = "svlint"; rev = "v${version}"; - sha256 = "sha256-2PYHKJ141RWdUIDAKAFK6IzR4C41bHi/A8lDErSRLnU="; + sha256 = "sha256-p002oWwTQxesWLgLq8oKKzuZKXUdO4C1TZ7lR/Mh1PA="; }; - cargoSha256 = "sha256-x5wU0Ld4ssRoNqo9graJhjlpel+VdVdkKZMjHFqZsrE="; + cargoSha256 = "sha256-M0hng1JcR5Q829bVOaTASl0Eq6fFm8mUFsS5zx1JX94="; meta = with lib; { description = "SystemVerilog linter"; From c80586cde4bccc4dcd193738b7c1ff451c612c43 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Mar 2021 16:29:21 +0000 Subject: [PATCH 52/81] upterm: 0.5.2 -> 0.6.5 --- pkgs/tools/misc/upterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/tools/misc/upterm/default.nix index 533ef192e8d..2f504a0cef8 100644 --- a/pkgs/tools/misc/upterm/default.nix +++ b/pkgs/tools/misc/upterm/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "upterm"; - version = "0.5.2"; + version = "0.6.5"; src = fetchFromGitHub { owner = "owenthereal"; repo = "upterm"; rev = "v${version}"; - sha256 = "007hgkkn1cq1i0rkn45i3bz5q9irzm67cz0j5glr6f6d4s0nkjiq"; + sha256 = "sha256-wzDK7iQN/z/M1mTKPCH3c+OjFsavplV/0oMiOe5thuI="; }; vendorSha256 = null; From 5566b57df019c4183ab5db63e992c26cb5dd6269 Mon Sep 17 00:00:00 2001 From: upkeep-bot Date: Tue, 16 Mar 2021 12:17:02 +0000 Subject: [PATCH 53/81] vscodium: 1.53.2 -> 1.54.3 --- pkgs/applications/editors/vscode/vscodium.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index bdc5552a64f..06613485e7f 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1b9pzfi034idhi6f3n0sz3fckf95ckf2qx3sgfn9fx2g52r9m9z1"; - x86_64-darwin = "1983d8hn04xl5vw7p6842cv5x08q7vilqg7nhvy5yg3lj9q2rpp0"; - aarch64-linux = "09l32abkq110ib4hjd0yv9avr8a2vg5vs7w4jpk0p499gzrysh2l"; - armv7l-linux = "1s0gbq1fapq2i905c0xxfyh0656qnb7dmg00khlwbplxzd6i6m18"; + x86_64-linux = "1577wxmm8623aj513hxqcfim4d9p1r9wbla9my0c0c1x6pik0h8h"; + x86_64-darwin = "1n8q626nlqw78wlpfppzj365gmlz2swll6csg3ic7p4ik3nak95b"; + aarch64-linux = "1a7rkmhz456rsqw95lrknp1wqsdp63pkzh76vhzy5bazb1h081v0"; + armv7l-linux = "1qjik1r41c8n9fs7p09p0zdj8c5xgqjniwv23hcy6mp28i4whclr"; }.${system}; sourceRoot = { @@ -33,7 +33,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.53.2"; + version = "1.54.3"; pname = "vscodium"; executableName = "codium"; From 8177519fbeb6e1d18b6f3ddfdc62402e71ba165c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 17 Mar 2021 10:30:29 +0000 Subject: [PATCH 54/81] croc: 8.6.10 -> 8.6.11 --- pkgs/tools/networking/croc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index b2710a2c33a..8c57d946950 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "8.6.10"; + version = "8.6.11"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/JS173hIW3doDCP/5v8dUSEW44pyq6VdF17Za6JWtys="; + sha256 = "sha256-+ej6Q2XczWVcu7lMRjt+Sj2FZxlfFSepE6crCFgPuoc="; }; - vendorSha256 = "sha256-5UaOFTm72RG/xsShliU32Vp6qNANDyAotbaRYyan87U="; + vendorSha256 = "sha256-50ESG3GL9BcTaGp1Q5rc1XklF3H7WKcyM1yq7SZa2QE="; doCheck = false; From adb6f51529494a6fdc25b7585983deac8ca3b426 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Wed, 17 Mar 2021 19:35:55 +0900 Subject: [PATCH 55/81] irssi: fix GLib > 2.62 breaking input on nul byte See https://github.com/irssi/irssi/issues/1180 for rationale --- pkgs/applications/networking/irc/irssi/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 91617a26782..7c9714b3555 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: stdenv.mkDerivation rec { pname = "irssi"; @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0g2nxazn4lszmd6mf1s36x5ablk4999g1qx7byrnvgnjsihjh62k"; }; + # Fix irssi on GLib >2.62 input being stuck after entering a NUL byte + # See https://github.com/irssi/irssi/issues/1180 - remove after next update. + patches = fetchpatch { + url = "https://github.com/irssi/irssi/releases/download/1.2.2/glib-2-63.patch"; + sha256 = "1ad1p7395n8dfmv97wrf751wwzgncqfh9fp27kq5kfdvh661da1i"; + }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses glib openssl perl libintl libgcrypt libotr ]; From 494746288d5aa1f4c577bcbc27f43eea7301199c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 17 Mar 2021 16:00:10 +0100 Subject: [PATCH 56/81] apostrophe: 2.3 -> 2.4 https://gitlab.gnome.org/somas/apostrophe/-/releases/v2.4 --- pkgs/applications/editors/apostrophe/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index dd8757d0c17..5d435fa6823 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -13,14 +13,14 @@ let in stdenv.mkDerivation rec { pname = "apostrophe"; - version = "2.3"; + version = "2.4"; src = fetchFromGitLab { owner = "somas"; repo = pname; domain = "gitlab.gnome.org"; rev = "v${version}"; - sha256 = "1ggrbbnhbnf6p3hs72dww3c9m1rvr4znggmvwcpj6i8v1a3kycnb"; + sha256 = "1qzy3zhi18wf42m034s8kcmx9gl05j620x3hf6rnycq2fvy7g4gz"; }; nativeBuildInputs = [ meson ninja cmake pkg-config desktop-file-utils @@ -32,9 +32,6 @@ in stdenv.mkDerivation rec { postPatch = '' patchShebangs --build build-aux/meson_post_install.py - - # get rid of unused distributed dependencies - rm -r ${pname}/pylocales ''; preFixup = '' From 84858b3a76bb409c215ec70b0b72bababe459d53 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 17 Mar 2021 17:51:27 +0000 Subject: [PATCH 57/81] rpi-imager: 1.5 -> 1.6 --- pkgs/tools/misc/rpi-imager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix index a18a8d6d38d..963a0832ef9 100644 --- a/pkgs/tools/misc/rpi-imager/default.nix +++ b/pkgs/tools/misc/rpi-imager/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "rpi-imager"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = "v${version}"; - sha256 = "0596c7rpkykmjr3gsz9yczqsj7fzq04kc97s0rqkygjnwiqh2rwz"; + sha256 = "sha256-wX9EO5hgEM2ftOov0AERloH6GxrwptWltBYWLFXkPUw="; }; nativeBuildInputs = [ cmake ]; From 7444abbf1dbec7aa67c9301ad614ea000d186353 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Thu, 18 Mar 2021 11:28:34 +1100 Subject: [PATCH 58/81] eventstore: add x86_64-darwin to supported platforms Reported as working. --- pkgs/servers/nosql/eventstore/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index abec3c5f79f..4a6db24bc4c 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { description = "Event sourcing database with processing logic in JavaScript"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ puffnfresh ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } From f380c1805a19a37ae7029ee4ec8748638ce4a0ab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 18 Mar 2021 07:47:50 +0000 Subject: [PATCH 59/81] gnomeExtensions.appindicator: 34 -> 35 --- pkgs/desktops/gnome-3/extensions/appindicator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix index f5dae739ea4..24709d0f2a2 100644 --- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix +++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-appindicator"; - version = "34"; + version = "35"; src = fetchFromGitHub { owner = "Ubuntu"; repo = "gnome-shell-extension-appindicator"; rev = "v${version}"; - sha256 = "0p9sk8cv2z242d5783gx2m4l1x9vg5fy1a7yr1wcfshvajlrj23m"; + sha256 = "sha256-xVoXVVEULZZnoYEXl1x96Tjs8hOvs9/sOAUVMj9kKCo="; }; # This package has a Makefile, but it's used for building a zip for From 272e287c7eedde9de799dd2d42aff071b22a8a10 Mon Sep 17 00:00:00 2001 From: Massimo Redaelli Date: Thu, 18 Mar 2021 22:03:55 +0100 Subject: [PATCH 60/81] handlr: init at 0.5.0 --- pkgs/tools/misc/handlr/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/handlr/default.nix diff --git a/pkgs/tools/misc/handlr/default.nix b/pkgs/tools/misc/handlr/default.nix new file mode 100644 index 00000000000..1d825c866c4 --- /dev/null +++ b/pkgs/tools/misc/handlr/default.nix @@ -0,0 +1,25 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "handlr"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "chmln"; + repo = pname; + rev = "v${version}"; + sha256 = "1f4gmlqzgw1r8n0w9dr9lpsn94f2hlnak9bbq5xgf6jwgc9mwqzg"; + }; + + cargoSha256 = "16d4dywwkgvvxw6ninrx87rqhx0whdq3yy01m27qjy4gz6z6ad8p"; + + # Most tests fail (at least some due to directory permissions) + doCheck = false; + + meta = with lib; { + description = "Alternative to xdg-open to manage default applications with ease"; + homepage = "https://github.com/chmln/handlr"; + license = licenses.mit; + maintainers = with maintainers; [ mredaelli ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03fcbd4d101..9d5bbaa1824 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23759,6 +23759,8 @@ in inherit (darwin) libobjc; }; + handlr = callPackage ../tools/misc/handlr { }; + jftui = callPackage ../applications/video/jftui { }; lime = callPackage ../development/libraries/lime { }; From 4877b08403ecf84f2bf9e2271794bbdb08cadffb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 19 Mar 2021 12:50:48 +0000 Subject: [PATCH 61/81] crcpp: 1.0.1.0 -> 1.1.0.0 --- pkgs/development/libraries/crcpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/crcpp/default.nix b/pkgs/development/libraries/crcpp/default.nix index 9410b071500..3b9f4f942ac 100644 --- a/pkgs/development/libraries/crcpp/default.nix +++ b/pkgs/development/libraries/crcpp/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "crcpp"; - version = "1.0.1.0"; + version = "1.1.0.0"; src = fetchFromGitHub { owner = "d-bahr"; repo = "CRCpp"; rev = "release-${version}"; - sha256 = "138w97kfxnv8rcnvggba6fcxgbgq8amikkmy3jhqfn6xzy6zaimh"; + sha256 = "sha256-jBvh4dHSFChxNPVgkGVHy3TXSExsfwdVUfsA8XB1cn8="; }; dontBuild = true; From f8f128ca22469efb94b9e76b7dd696251e931492 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 19 Mar 2021 13:13:30 +0000 Subject: [PATCH 62/81] dnsproxy: 0.35.5 -> 0.36.0 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 8cf669494d1..0b36c76ca62 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.35.5"; + version = "0.36.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DScN/swigecdhucxhfP1mNr2mDX6HbY2dktkN8BxBjI="; + sha256 = "sha256-VTmQ37kUWlc18p8Qdm2ZFID+t6OIp7y2qU12rXqE6Xo="; }; vendorSha256 = null; From 7d1842530405ca512ef7357ae9e6b13104734547 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 19 Mar 2021 16:33:42 +0000 Subject: [PATCH 63/81] kubernetes: 1.20.4 -> 1.20.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 c218e1b492b..12127e223a3 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.20.4"; + version = "1.20.5"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0nni351ya688dphdkpyq94p3wjw2kigg85kmalwdpv5wpz1abl5g"; + sha256 = "sha256-RDaD7tlTtAucW8ido9FumKb5E9n6F9H8HwxQ9TPyOLk="; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; From bb072530f52757c07608cdb9e3e4bc43fbeb03d5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 19 Mar 2021 21:59:17 +0000 Subject: [PATCH 64/81] simdjson: 0.8.2 -> 0.9.1 --- pkgs/development/libraries/simdjson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 37ea3b65728..f0b68845edb 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "0.8.2"; + version = "0.9.1"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-azRuLB03NvW+brw7A/kbgkjoDUlk1p7Ch4zZD55QiMQ="; + sha256 = "sha256-e9Y5QEs9xqfJpaWxnA6iFwHE6TTGyVM7hfFuMEmpW78="; }; nativeBuildInputs = [ cmake ]; From 9e76601be059f55b5a3020ca0a104c91c0799feb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 20 Mar 2021 04:20:00 +0000 Subject: [PATCH 65/81] mpd: fix build on darwin --- 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 c3d74cd78ad..9a273785818 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18316,7 +18316,7 @@ in mod_pkcs12 = pkgs.apacheHttpdPackages.mod_pkcs12; mod_timestamp = pkgs.apacheHttpdPackages.mod_timestamp; - inherit (callPackages ../servers/mpd { }) + inherit (callPackages ../servers/mpd { stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv; }) mpd mpd-small mpdWithFeatures; libmpdclient = callPackage ../servers/mpd/libmpdclient.nix { }; From bb0a63e7e0b97bde5f652c44bd498669399ff6fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 20 Mar 2021 16:36:04 +0100 Subject: [PATCH 66/81] mupdf: format expression --- pkgs/applications/misc/mupdf/default.nix | 29 ++++++++++++------------ 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 61c395e64a9..e641e5b4b62 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -22,24 +22,23 @@ in stdenv.mkDerivation rec { sha256 = "0rljl44y8p8hgaqializlyrgpij1wbnrzyp0ll5kcg7w05nylq48"; }; - patches = - lib.optional stdenv.isDarwin ./darwin.patch ++ [ + patches = lib.optional stdenv.isDarwin ./darwin.patch ++ [ (fetchpatch { - name = "pdfocr.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a507b139adf37d2c742e039815601cdc2aa00a84"; - sha256 = "1fx6pdgwrbk3bqsx53764d61llfj9s5q8lxqkna7mjnp7mg4krj3"; - }) + name = "pdfocr.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a507b139adf37d2c742e039815601cdc2aa00a84"; + sha256 = "1fx6pdgwrbk3bqsx53764d61llfj9s5q8lxqkna7mjnp7mg4krj3"; + }) (fetchpatch { - name = "pdf-layer.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54"; - sha256 = "0ma8jq8d9a0mf26qjklgi4gdaflpjik1br1nhafzvjz7ccl56ksm"; - }) + name = "pdf-layer.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54"; + sha256 = "0ma8jq8d9a0mf26qjklgi4gdaflpjik1br1nhafzvjz7ccl56ksm"; + }) (fetchpatch { - name = "pixmap.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=32e4e8b4bcbacbf92af7c88337efae21986d9603"; - sha256 = "1zqkxgwrhcwsdya98pcmpq2815jjmv3fwsp0sba9f5nq5xi6whbj"; - }) - ]; + name = "pixmap.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=32e4e8b4bcbacbf92af7c88337efae21986d9603"; + sha256 = "1zqkxgwrhcwsdya98pcmpq2815jjmv3fwsp0sba9f5nq5xi6whbj"; + }) + ]; postPatch = '' sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c From 206e3f405ed96c72a8e050140287bb193d123d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 20 Mar 2021 16:36:16 +0100 Subject: [PATCH 67/81] mupdf: fix CVE-2021-3407 --- pkgs/applications/misc/mupdf/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index e641e5b4b62..333e3cd9315 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -38,6 +38,11 @@ in stdenv.mkDerivation rec { url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=32e4e8b4bcbacbf92af7c88337efae21986d9603"; sha256 = "1zqkxgwrhcwsdya98pcmpq2815jjmv3fwsp0sba9f5nq5xi6whbj"; }) + (fetchpatch { + name = "CVE-2021-3407.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=cee7cefc610d42fd383b3c80c12cbc675443176a"; + sha256 = "18g9jsj90jnqibaff8pqi70a7x8ygc3sh4jl4xnvlv8vr7fxxbh6"; + }) ]; postPatch = '' From 42f157fd07d870ef0cacd1f5c6a0ba4d6eaecf05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 20 Mar 2021 19:30:19 +0100 Subject: [PATCH 68/81] mapbox-gl-native: use upstream version, unvendor rapidjson, and move to libsForQt5 The first two patches are needed for mapbox-gl-qml. The third patch is required when building without the vendored rapidjson. --- .../libraries/mapbox-gl-native/default.nix | 38 +++++++++++++++---- pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/qt5-packages.nix | 2 + 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/mapbox-gl-native/default.nix b/pkgs/development/libraries/mapbox-gl-native/default.nix index e98903e3a83..c71bf17a3c7 100644 --- a/pkgs/development/libraries/mapbox-gl-native/default.nix +++ b/pkgs/development/libraries/mapbox-gl-native/default.nix @@ -1,20 +1,44 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config -, qtbase, curl, libuv, glfw3 }: +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkg-config +, qtbase, curl, libuv, glfw3, rapidjson }: mkDerivation rec { pname = "mapbox-gl-native"; - version = "2020.06.07"; + version = "1.6.0"; src = fetchFromGitHub { owner = "mapbox"; repo = "mapbox-gl-native"; - rev = "e18467d755f470b26f61f6893eddd76ecf0816e6"; - sha256 = "1x271gg9h81jpi70pv63i6lsa1zg6bzja9mbz7bsa4s02fpqy7wh"; + rev = "maps-v${version}"; + sha256 = "027rw23yvd5a6nl9b5hsanddc44nyb17l2whdcq9fxb9n6vcda4c"; fetchSubmodules = true; }; + patches = [ + # https://github.com/mapbox/mapbox-gl-native/pull/16591 + (fetchpatch { + name = "add-support-for-qmapboxgl-installation.patch"; + url = "https://github.com/mapbox/mapbox-gl-native/commit/e18467d755f470b26f61f6893eddd76ecf0816e6.patch"; + sha256 = "0gs7wmkvyhf2db4cwbsq31sprsh1avi70ggvi32bk0wn3cw4d79b"; + }) + (fetchpatch { + name = "add-support-for-using-qmapboxgl-as-a-proper-cmake-dependency.patch"; + url = "https://github.com/mapbox/mapbox-gl-native/commit/ab27b9b8207754ef731b588d187c470ffb084455.patch"; + sha256 = "1lr5p1g4qaizs57vjqry9aq8k1ki59ks0y975chlnrm2sffp140r"; + }) + (fetchpatch { + name = "skip-license-check.patch"; + url = "https://git.alpinelinux.org/aports/plain/testing/mapbox-gl-native/0002-skip-license-check.patch?id=6751a93dca26b0b3ceec9eb151272253a2fe497e"; + sha256 = "1yybwzxbvn0lqb1br1fyg7763p2h117s6mkmywkl4l7qg9daa7ba"; + }) + ]; + + postPatch = '' + # don't use vendored rapidjson + rm -r vendor/mapbox-base/extras/rapidjson + ''; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ curl libuv glfw3 qtbase ]; + buildInputs = [ curl libuv glfw3 qtbase rapidjson ]; cmakeFlags = [ "-DMBGL_WITH_QT=ON" @@ -27,7 +51,7 @@ mkDerivation rec { description = "Interactive, thoroughly customizable maps in native Android, iOS, macOS, Node.js, and Qt applications, powered by vector tiles and OpenGL"; homepage = "https://mapbox.com/mobile"; license = licenses.bsd2; - maintainers = [ maintainers.Thra11 ]; + maintainers = with maintainers; [ Thra11 dotlambda ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b7831d8796..15aa3fae6a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16077,8 +16077,6 @@ in opencl-clang = callPackage ../development/libraries/opencl-clang { }; - mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { }; - mapbox-gl-qml = libsForQt5.callPackage ../development/libraries/mapbox-gl-qml { }; mapnik = callPackage ../development/libraries/mapnik { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 656a8a5c0f0..6517b717b1d 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -115,6 +115,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 // kpmcore = callPackage ../development/libraries/kpmcore { }; + mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { }; + mauikit = callPackage ../development/libraries/mauikit { }; mlt = callPackage ../development/libraries/mlt/qt-5.nix { }; From cccebb6f372d2fdf5110e3db5cf9fb459fe9fda4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 21 Mar 2021 11:14:52 +0100 Subject: [PATCH 69/81] mapbox-gl-qml: 1.7.5 -> 1.7.6 and move to libsForQt5 --- .../libraries/mapbox-gl-qml/default.nix | 25 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/qt5-packages.nix | 2 ++ 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/mapbox-gl-qml/default.nix b/pkgs/development/libraries/mapbox-gl-qml/default.nix index 1740b9ae580..87e76576622 100644 --- a/pkgs/development/libraries/mapbox-gl-qml/default.nix +++ b/pkgs/development/libraries/mapbox-gl-qml/default.nix @@ -1,22 +1,31 @@ -{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtlocation, mapbox-gl-native }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkg-config +, curl +, qtbase +, qtlocation +, mapbox-gl-native +}: mkDerivation rec { pname = "mapbox-gl-qml"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "rinigus"; repo = "mapbox-gl-qml"; rev = version; - sha256 = "1izwkfqn8jl83vihcxl2b159sqmkn1amxf92zw0h6psls2g9xhwx"; + sha256 = "sha256-E6Pkr8khzDbhmJxzK943+H6cDREgwAqMnJQ3hQWU7fw="; }; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtlocation mapbox-gl-native ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ curl qtlocation mapbox-gl-native ]; postPatch = '' - substituteInPlace mapbox-gl-qml.pro \ - --replace '$$[QT_INSTALL_QML]' $out'/${qtbase.qtQmlPrefix}' + substituteInPlace src/CMakeLists.txt \ + --replace ' ''${QT_INSTALL_QML}' " $out/${qtbase.qtQmlPrefix}" ''; # Package expects qt5 subdirectory of mapbox-gl-native to be in the include path @@ -26,7 +35,7 @@ mkDerivation rec { description = "Unofficial Mapbox GL Native bindings for Qt QML"; homepage = "https://github.com/rinigus/mapbox-gl-qml"; license = licenses.lgpl3Only; - maintainers = [ maintainers.Thra11 ]; + maintainers = with maintainers; [ Thra11 dotlambda ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15aa3fae6a7..7a41963714e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16077,8 +16077,6 @@ in opencl-clang = callPackage ../development/libraries/opencl-clang { }; - mapbox-gl-qml = libsForQt5.callPackage ../development/libraries/mapbox-gl-qml { }; - mapnik = callPackage ../development/libraries/mapnik { }; marisa = callPackage ../development/libraries/marisa {}; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 6517b717b1d..bfc576e6554 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -117,6 +117,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 // mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { }; + mapbox-gl-qml = libsForQt5.callPackage ../development/libraries/mapbox-gl-qml { }; + mauikit = callPackage ../development/libraries/mauikit { }; mlt = callPackage ../development/libraries/mlt/qt-5.nix { }; From 7a0533d43802698f69547a68358b41a4bfc79941 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Sun, 21 Mar 2021 11:21:10 -0700 Subject: [PATCH 70/81] bs-platform: remove myself from maintainers --- pkgs/development/compilers/bs-platform/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/development/compilers/bs-platform/default.nix index 50274c9eca6..ea56b85dec9 100644 --- a/pkgs/development/compilers/bs-platform/default.nix +++ b/pkgs/development/compilers/bs-platform/default.nix @@ -21,7 +21,7 @@ in description = "A JavaScript backend for OCaml focused on smooth integration and clean generated code"; homepage = "https://bucklescript.github.io"; license = licenses.lgpl3; - maintainers = with maintainers; [ turbomack gamb anmonteiro ]; + maintainers = with maintainers; [ turbomack gamb ]; platforms = platforms.all; }; }) From fc0f84cfe1f75a6b94a2377d079a0dc27f95e50b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Mar 2021 20:11:00 +0100 Subject: [PATCH 71/81] teler: set version --- pkgs/tools/security/teler/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/teler/default.nix b/pkgs/tools/security/teler/default.nix index 1c4cba04d56..0ef2f7509b6 100644 --- a/pkgs/tools/security/teler/default.nix +++ b/pkgs/tools/security/teler/default.nix @@ -1,6 +1,6 @@ -{ buildGoModule +{ lib +, buildGoModule , fetchFromGitHub -, lib }: buildGoModule rec { @@ -16,6 +16,10 @@ buildGoModule rec { vendorSha256 = "sha256-KvUnDInUqFW7FypgsppIBQZKNu6HVsEeHtGwdqYtoys="; + preBuild = '' + buildFlagsArray+=("-ldflags" "-s -w -X ktbs.dev/teler/common.Version=${version}") + ''; + # test require internet access doCheck = false; From 669cfc195fe46dc6b89ac7ad2c6f403c7457c0f9 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Sun, 21 Mar 2021 11:04:26 -0700 Subject: [PATCH 72/81] ocaml-lsp, lsp, jsonrpc: allow overriding the source globally Co-authored-by: Sandro --- .../ocaml-modules/ocaml-lsp/default.nix | 73 ++----------------- .../ocaml-modules/ocaml-lsp/jsonrpc.nix | 31 ++++++++ .../ocaml-modules/ocaml-lsp/lsp.nix | 44 +++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 4 files changed, 82 insertions(+), 68 deletions(-) create mode 100644 pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix create mode 100644 pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix index 46c84d8d70d..7ff18822e93 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix @@ -1,78 +1,15 @@ -{ buildDunePackage -, stdlib-shims -, ppx_yojson_conv_lib -, ocaml-syntax-shims -, yojson -, result -, omd -, octavius -, dune-build-info -, uutf -, csexp -, cmdliner -, fetchzip -, lib -}: -let - version = "1.4.1"; - src = fetchzip { - url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/jsonrpc-${version}.tbz"; - sha256 = "0hzpw17qfhb0cxgwah1fv4k300r363dy1kv0977anl44dlanx1v5"; - }; +{ buildDunePackage, jsonrpc, lsp }: - # unvendor some (not all) dependencies. - # They are vendored by upstream only because it is then easier to install - # ocaml-lsp without messing with your opam switch, but nix should prevent - # this type of problems without resorting to vendoring. - preBuild = '' - rm -r ocaml-lsp-server/vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner} - ''; - - buildInputs = [ - stdlib-shims - ppx_yojson_conv_lib - ocaml-syntax-shims - octavius - uutf - csexp - dune-build-info - omd - cmdliner - jsonrpc - ]; - - lsp = buildDunePackage { - pname = "lsp"; - inherit version src; - useDune2 = true; - minimumOCamlVersion = "4.06"; - - inherit buildInputs preBuild; - }; - - jsonrpc = buildDunePackage { - pname = "jsonrpc"; - inherit version src; - useDune2 = true; - minimumOCamlVersion = "4.06"; - - buildInputs = [ yojson stdlib-shims ocaml-syntax-shims ppx_yojson_conv_lib result ]; - }; - -in buildDunePackage { pname = "ocaml-lsp-server"; - inherit version src; + inherit (jsonrpc) version src; useDune2 = true; - inherit preBuild; + inherit (lsp) preBuild; - buildInputs = buildInputs ++ [ lsp ]; + buildInputs = lsp.buildInputs ++ [ lsp ]; - meta = with lib; { + meta = jsonrpc.meta // { description = "OCaml Language Server Protocol implementation"; - license = lib.licenses.isc; - platforms = platforms.unix; - maintainers = [ maintainers.symphorien maintainers.marsam ]; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix new file mode 100644 index 00000000000..701604c8710 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -0,0 +1,31 @@ +{ buildDunePackage +, stdlib-shims +, ppx_yojson_conv_lib +, ocaml-syntax-shims +, yojson +, result +, fetchzip +, lib +}: + + +buildDunePackage rec { + pname = "jsonrpc"; + version = "1.4.1"; + src = fetchzip { + url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/jsonrpc-${version}.tbz"; + sha256 = "0hzpw17qfhb0cxgwah1fv4k300r363dy1kv0977anl44dlanx1v5"; + }; + + useDune2 = true; + minimumOCamlVersion = "4.06"; + + buildInputs = [ yojson stdlib-shims ocaml-syntax-shims ppx_yojson_conv_lib result ]; + + meta = with lib; { + description = "Jsonrpc protocol implementation in OCaml"; + license = licenses.isc; + platforms = platforms.unix; + maintainers = with maintainers; [ symphorien marsam ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix new file mode 100644 index 00000000000..b501282c155 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -0,0 +1,44 @@ +{ buildDunePackage +, stdlib-shims +, ppx_yojson_conv_lib +, ocaml-syntax-shims +, jsonrpc +, omd +, octavius +, dune-build-info +, uutf +, csexp +, cmdliner +}: + +buildDunePackage { + pname = "lsp"; + inherit (jsonrpc) version src; + useDune2 = true; + minimumOCamlVersion = "4.06"; + + # unvendor some (not all) dependencies. + # They are vendored by upstream only because it is then easier to install + # ocaml-lsp without messing with your opam switch, but nix should prevent + # this type of problems without resorting to vendoring. + preBuild = '' + rm -r ocaml-lsp-server/vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner} + ''; + + buildInputs = [ + stdlib-shims + ppx_yojson_conv_lib + ocaml-syntax-shims + octavius + uutf + csexp + dune-build-info + omd + cmdliner + jsonrpc + ]; + + meta = jsonrpc.meta // { + description = "LSP protocol implementation in OCaml"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index fd8165085f0..0e3b21e59ad 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -781,6 +781,8 @@ let ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; + jsonrpc = callPackage ../development/ocaml-modules/ocaml-lsp/jsonrpc.nix { }; + lsp = callPackage ../development/ocaml-modules/ocaml-lsp/lsp.nix { }; ocaml-lsp = callPackage ../development/ocaml-modules/ocaml-lsp { }; ocaml-migrate-parsetree = ocaml-migrate-parsetree-1-8; From e36737f7bdae26341a75e420dc9df2a625b93b26 Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Sun, 21 Mar 2021 20:43:31 +0100 Subject: [PATCH 73/81] semantik: Init at 1.2.5 (#95818) Co-authored-by: Sandro --- pkgs/applications/office/semantik/default.nix | 90 +++++++++++++++++++ pkgs/applications/office/semantik/qt5.patch | 78 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 170 insertions(+) create mode 100644 pkgs/applications/office/semantik/default.nix create mode 100644 pkgs/applications/office/semantik/qt5.patch diff --git a/pkgs/applications/office/semantik/default.nix b/pkgs/applications/office/semantik/default.nix new file mode 100644 index 00000000000..371dd52a840 --- /dev/null +++ b/pkgs/applications/office/semantik/default.nix @@ -0,0 +1,90 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, wafHook +, pkg-config +, cmake +, qtbase +, python3 +, qtwebengine +, qtsvg +, ncurses6 +, kio +, kauth +, kiconthemes +, kconfigwidgets +, kxmlgui +, kcoreaddons +, kconfig +, kwidgetsaddons +, ki18n +, sonnet +, kdelibs4support +}: + +mkDerivation rec { + pname = "semantik"; + version = "1.2.5"; + + src = fetchFromGitLab { + owner = "ita1024"; + repo = "semantik"; + rev = "semantik-${version}"; + sha256 = "0dkg6mbnsbvbis17iz8v59wlhld93nc51abnkbyqvvkyyiqb006c"; + }; + + patches = [ ./qt5.patch ]; + + postPatch = '' + echo "${lib.getDev qtwebengine}" + substituteInPlace wscript \ + --replace @Qt5Base_dev@ "${lib.getDev qtbase}" \ + --replace @KF5KIOCore_dev@ "${lib.getDev kio}" \ + --replace @KF5Auth_dev@ "${lib.getDev kauth}" \ + --replace @KF5IconThemes_dev@ "${lib.getDev kiconthemes}" \ + --replace @KF5ConfigWidgets_dev@ "${lib.getDev kconfigwidgets}" \ + --replace @KF5XmlGui_dev@ "${lib.getDev kxmlgui}" \ + --replace @KF5CoreAddons_dev@ "${lib.getDev kcoreaddons}" \ + --replace @KF5Config_dev@ "${lib.getDev kconfig}" \ + --replace @KF5WidgetsAddons_dev@ "${lib.getDev kwidgetsaddons}" \ + --replace @KF5I18n_dev@ "${lib.getDev ki18n}" \ + --replace @KF5SonnetUi_dev@ "${lib.getDev sonnet}" \ + --replace @Qt5Svg@ "${qtsvg}" \ + --replace @Qt5Svg_dev@ "${lib.getDev qtsvg}" \ + --replace @Qt5WebEngine@ "${qtwebengine}" \ + --replace @Qt5WebEngine_dev@ "${lib.getDev qtwebengine}" \ + --replace /usr/include/KF5/KDELibs4Support "${lib.getDev kdelibs4support}/include/KF5/KDELibs4Support" + ''; + + nativeBuildInputs = [ (lib.getDev qtsvg) (lib.getLib qtsvg) python3 pkg-config wafHook cmake ]; + + buildInputs = [ + qtbase + qtwebengine + qtsvg + ncurses6 + kio + kauth + kiconthemes + kconfigwidgets + kxmlgui + kcoreaddons + kconfig + kwidgetsaddons + ki18n + sonnet + kdelibs4support + ]; + + wafConfigureFlags = [ + "--qtlibs=${lib.getLib qtbase}/lib" + ]; + + meta = with lib; { + description = "A mind-mapping application for KDE"; + license = licenses.mit; + homepage = "https://waf.io/semantik.html"; + maintainers = [ maintainers.shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/office/semantik/qt5.patch b/pkgs/applications/office/semantik/qt5.patch new file mode 100644 index 00000000000..6d41babdff4 --- /dev/null +++ b/pkgs/applications/office/semantik/qt5.patch @@ -0,0 +1,78 @@ +diff --color -ur a/wscript b/wscript +--- a/wscript 2020-08-17 19:49:43.389864343 +0200 ++++ b/wscript 2020-08-18 00:22:51.172556519 +0200 +@@ -149,6 +149,26 @@ + if not conf.env.QT_LRELEASE: conf.fatal('Semantik requires the program lrelease (from the Qt linguist package? - compilation only)') + conf.find_program('python3', var='PYTHON') + conf.load('python') ++ conf.env.HAVE_QT5SVG = 1 ++ conf.env.DEFINES_QT5SVG = [ 'QT_SVG_LIB' ] ++ conf.env.INCLUDES_QT5SVG = [ '@Qt5Svg_dev@/include/QtSvg' ] ++ conf.env.LIBPATH_QT5SVG = '@Qt5Svg@/lib' ++ conf.env.LIB_QT5SVG = [ 'Qt5Svg', 'Qt5Core', 'Qt5Gui', 'Qt5Widgets' ] ++ conf.env.HAVE_QT5WEBENGINEWIDGETS = 1 ++ conf.env.DEFINES_QT5WEBENGINEWIDGETS = [ 'QT_WEBENGINEWIDGETS_LIB' ] ++ conf.env.INCLUDES_QT5WEBENGINEWIDGETS = [ '@Qt5WebEngine_dev@/include/QtWebEngineWidgets' ] ++ conf.env.LIBPATH_QT5WEBENGINEWIDGETS = '@Qt5WebEngine@/lib' ++ conf.env.LIB_QT5WEBENGINEWIDGETS = [ ++ 'Qt5WebEngineWidgets', ++ 'Qt5Core', ++ 'Qt5Gui', ++ 'Qt5WebEngineCore', ++ 'Qt5Widgets', ++ 'Qt5Network', ++ 'Qt5Quick', ++ 'Qt5PrintSupport' ++ ] ++ print("conf.env.LIB_QT5SVG : ",conf.env) + if not conf.env.LIB_QT5SVG: conf.fatal('Could not find Qt5Svg - Semantik requires Qt >= 5') + if not conf.env.LIB_QT5WEBENGINEWIDGETS: conf.fatal('Could not find Qt5WebEngineWidgets - check `pkg-config --libs Qt5WebEngineWidgets`') + if not conf.env.LIB_QT5DBUS: conf.fatal('Install Qt Dbus') +@@ -186,7 +206,11 @@ + raise ValueError('Could not find QT_HOST_DATA') + + specpath = conf.cmd_and_log(conf.env.QMAKE + ['-query', 'QMAKE_SPEC'], quiet=0, stdout=True) ++ path = "@Qt5Base_dev@" ++ print("\n\n[log] specpath = ",specpath,"\n") ++ print("\n\n[log] path = ",path,"\n") + specpath = os.path.join(path, 'mkspecs', specpath.strip()) ++ print("\n\n[log] specpath = ",specpath,"\n") + if not os.path.exists(specpath): + raise ValueError('No spec path, cannot build') + +@@ -196,17 +220,28 @@ + + conf.env.append_value('INCLUDES_KDECORE', specpath) + +- libs = ['KF5KIOCore', 'KF5Auth', 'KF5KIOWidgets', +- 'KF5IconThemes', 'KF5ConfigWidgets', 'KF5XmlGui', +- 'KF5CoreAddons', 'KF5ConfigGui', 'KF5ConfigCore', +- 'KF5WidgetsAddons', 'KF5I18n', 'KF5SonnetUi'] ++ libs = { ++ 'KF5KIOCore': '@KF5KIOCore_dev@', ++ 'KF5Auth': '@KF5Auth_dev@', ++ 'KF5KIOWidgets': '@KF5KIOCore_dev@', ++ 'KF5IconThemes': '@KF5IconThemes_dev@', ++ 'KF5ConfigWidgets': '@KF5ConfigWidgets_dev@', ++ 'KF5XmlGui': '@KF5XmlGui_dev@', ++ 'KF5CoreAddons': '@KF5CoreAddons_dev@', ++ 'KF5ConfigGui': '@KF5Config_dev@', ++ 'KF5ConfigCore': '@KF5Config_dev@', ++ 'KF5WidgetsAddons': '@KF5WidgetsAddons_dev@', ++ 'KF5I18n': '@KF5I18n_dev@', ++ 'KF5SonnetUi': '@KF5SonnetUi_dev@', ++ } + +- for lib in libs: ++ for lib,mkspec_path in libs.items(): ++ print("[log] mkspec : ", mkspec_path) + name = lib[3:] + if not name.startswith('K') and name != 'SonnetUi': + name = 'K' + name +- +- p = '%s/qt_%s.pri' % (path, name) ++ p = '%s/qt_%s.pri' % (mkspec_path+"/mkspecs/modules", name) ++ print("[log] path :",path,", name : ",name) + for line in Utils.readf(p).splitlines(): + lst = line.strip().split(' = ') + if lst[0].endswith('.name'): diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58670a93350..b95c9dc467c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13048,6 +13048,8 @@ in semver-tool = callPackage ../development/tools/misc/semver-tool { }; + semantik = libsForQt5.callPackage ../applications/office/semantik { }; + sconsPackages = dontRecurseIntoAttrs (callPackage ../development/tools/build-managers/scons { }); scons = sconsPackages.scons_latest; From ac295b38f1c99ccd2e15c20f0e1da4df3dd6e383 Mon Sep 17 00:00:00 2001 From: ilkecan Date: Sun, 21 Mar 2021 22:48:42 +0300 Subject: [PATCH 74/81] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 38 ++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index d827e6bf5f7..1428a47f9b1 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -149,12 +149,12 @@ let async-vim = buildVimPluginFrom2Nix { pname = "async-vim"; - version = "2020-12-30"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "async.vim"; - rev = "236debf1a68d69a74f1f6647c273b0477e1ec1bf"; - sha256 = "12xz71182shfj8l300j7wnngxm5zkx2g1c2d4l6dvbk5z1dbzlj6"; + rev = "0fb846e1eb3c2bf04d52a57f41088afb3395212e"; + sha256 = "1glzg0i53wkm383y1vbddbyp1ivlsx2hivjchiw60sr9gccn8f8l"; }; meta.homepage = "https://github.com/prabirshrestha/async.vim/"; }; @@ -497,12 +497,12 @@ let coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2021-03-13"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "4f44d0749bf9ac1e3755c276222a20015c3fe3be"; - sha256 = "0qrg8m82pmzs8pia16z05pkm9hhcijlw8w79r35silccsicsz8l1"; + rev = "8f27377229c5d2dcee9ae9cda8dea0fad4a5ac3b"; + sha256 = "0ri0rlz4fwxli6ssz69zyifrdwhc8yx4p996rw8d2m76nm7hflv0"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -1619,12 +1619,12 @@ let git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger-vim"; - version = "2021-02-28"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "b79422434a419b97c5817d9ff645216952152443"; - sha256 = "0xwz4kw5mwqrh6s9vyzzx4fdl7335n9qjxzhm1c41hh1j2ikwqa9"; + rev = "6fe62ce47491953487dac540964a4cfb037be7f3"; + sha256 = "0g8gaprkrqs69rplmbf6nc03km6qcapipyc13rghb7fyksad51nr"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; @@ -3292,8 +3292,8 @@ let src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "6c84f0f79300933db5b315c33b54e8e969572f54"; - sha256 = "1mnrx8i4f2ya7wl010jslmgc78m67ak0dgzln1fjpr0g0apy5d1l"; + rev = "280d324111b114f3649743179ccfc496663cdfec"; + sha256 = "12y7jglbsl0lydx2a8syc9i02h21pzg3dcn4xspij41qblinv1g2"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -3396,12 +3396,12 @@ let open-browser-github-vim = buildVimPluginFrom2Nix { pname = "open-browser-github-vim"; - version = "2021-03-18"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "tyru"; repo = "open-browser-github.vim"; - rev = "4cf70fa31f5f6bc1ef3d4684a987f8d018cbca47"; - sha256 = "140r2abx733y544y468zjfvii7c467hhzrm53qqwws5na41017b5"; + rev = "ac7c034e300f36d591ef234dcd5eb5cd5c07c74f"; + sha256 = "0n62h0gjakdc3bnpysny0rndhqhq7g5c97pgr42wz599wnr1pily"; }; meta.homepage = "https://github.com/tyru/open-browser-github.vim/"; }; @@ -5800,12 +5800,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-03-20"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "ddea2ecb0ff221f1f4cdba4d3b5ff121c3ff0338"; - sha256 = "08s6xjc8175chr3qhg8p2zaj5d4akk4hpzms6dbq8z9553nn37ml"; + rev = "58d2b25836f420cf2fe20cc0b6f988165ae33782"; + sha256 = "0550dq20axl1qj6rasws2hsar7x4kjx9fspqzmkisv4wzrxr1kp5"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -6586,8 +6586,8 @@ let src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "e889f80f0f08b56808da8bb98fd7f4202a5035c0"; - sha256 = "0k2lsycaqdk5s1ghhx1yc7z6b7sj2xwkmp1jgrr7k089cg76d9wy"; + rev = "b8e75ef927b48848f3f21b7033aa68c9c88e9392"; + sha256 = "0c3b7r7vkxcfgznwylj5psbkvrph5qqsifawrxjdjgx2imc7arva"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; From fac96abe50c7a115f1a43c6752f1ad752f784d2d Mon Sep 17 00:00:00 2001 From: ilkecan Date: Sun, 21 Mar 2021 22:49:13 +0300 Subject: [PATCH 75/81] vimPlugins.rspec-vim: init at 2020-08-20 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 1428a47f9b1..96d70f2ff39 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3779,6 +3779,18 @@ let meta.homepage = "https://github.com/mfukar/robotframework-vim/"; }; + rspec-vim = buildVimPluginFrom2Nix { + pname = "rspec-vim"; + version = "2020-08-20"; + src = fetchFromGitHub { + owner = "keith"; + repo = "rspec.vim"; + rev = "e49d306de952c2195233b83f9ca9fa94e19affe4"; + sha256 = "0445abk039qlhk5s9jm5hawfksds5dgshb1lspvfkz8slk6m076z"; + }; + meta.homepage = "https://github.com/keith/rspec.vim/"; + }; + rtorrent-syntax-file = buildVimPluginFrom2Nix { pname = "rtorrent-syntax-file"; version = "2016-03-19"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 02de4eb8f1d..af90bbee409 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -264,6 +264,7 @@ kbenzie/vim-spirv kchmck/vim-coffee-script KeitaNakamura/neodark.vim keith/investigate.vim +keith/rspec.vim keith/swift.vim kevinhwang91/nvim-bqf@main kevinhwang91/nvim-hlslens@main From 5427f2a847ff8abb0465d51849b70134a7ba6686 Mon Sep 17 00:00:00 2001 From: Daniel Duan Date: Sun, 21 Mar 2021 12:54:25 -0700 Subject: [PATCH 76/81] tre-command: 0.3.4 -> 0.3.5 0.3.5 is a minor release with a bug fix for tre-command. [Release notes](https://github.com/dduan/tre/releases/tag/v0.3.5) --- pkgs/tools/system/tre-command/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/tre-command/default.nix b/pkgs/tools/system/tre-command/default.nix index f9e0e80478d..168a6f8ec31 100644 --- a/pkgs/tools/system/tre-command/default.nix +++ b/pkgs/tools/system/tre-command/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tre-command"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "dduan"; repo = "tre"; rev = "v${version}"; - sha256 = "0syvhpnw9c5csxv8c4gdfwif9a9vl4rjkwj4mfglgxk227k1y53q"; + sha256 = "1yhrawn8xdl84f5f56i8fikidrfbjnqw5ckjagk7f6ngpcjc0wxm"; }; - cargoSha256 = "056wlxz8hzky8315rnn65nh7dd2yhx5323y3hq64g6aqj52vd734"; + cargoSha256 = "03zvykjmb61bn8h4pm93iayhw1d53qv3l635jxfii1q7kzjbdnx9"; nativeBuildInputs = [ installShellFiles ]; From 898232add704e8b8566636e28ba7565dfd242ac7 Mon Sep 17 00:00:00 2001 From: Jason Lenz Date: Sun, 21 Mar 2021 16:25:17 -0500 Subject: [PATCH 77/81] epkowa: update iscan-data 1.39.1-2 -> 1.39.2-1 --- pkgs/misc/drivers/epkowa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index e027bd2e7f5..29ebfa17329 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -294,14 +294,14 @@ let fwdir = symlinkJoin { in let iscan-data = stdenv.mkDerivation rec { pname = "iscan-data"; - version = "1.39.1-2"; + version = "1.39.2-1"; src = fetchurl { urls = [ "http://support.epson.net/linux/src/scanner/iscan/iscan-data_${version}.tar.gz" "https://web.archive.org/web/http://support.epson.net/linux/src/scanner/iscan/iscan-data_${version}.tar.gz" ]; - sha256 = "04zrvbnxf1k6zinrd13hwnbzscc3qhmwlvx3k2jhjys2lginw7w4"; + sha256 = "092qhlnjjgz11ifx6mng7mz20i44gc0nlccrbmw18xr5hipbqqka"; }; buildInputs = [ From c37afee5550afc1a9935e42a859529dbb294d11d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Mar 2021 22:46:11 +0100 Subject: [PATCH 78/81] sqlmap: 1.4.12 -> 1.5.3 --- pkgs/development/python-modules/sqlmap/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 940dbdab989..065228eca21 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -1,17 +1,17 @@ { lib , buildPythonPackage , fetchPypi -, stdenv , file +, stdenv }: buildPythonPackage rec { pname = "sqlmap"; - version = "1.4.12"; + version = "1.5.3"; src = fetchPypi { inherit pname version; - sha256 = "166adazdrv92azx4p0qng0cm3va6i301vfsr4yyf0azj3sdg0waj"; + sha256 = "sha256-b2Q5Zelz0AWbNQotOLWdwN5+20Q5jATH3nzLEJQRwno="; }; postPatch = '' @@ -29,9 +29,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "sqlmap" ]; meta = with lib; { - homepage = "http://sqlmap.org"; - license = licenses.gpl2; description = "Automatic SQL injection and database takeover tool"; + homepage = "http://sqlmap.org"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ bennofs ]; }; } From f7ac029a1dec02245c057f967a324b7e3eecd5fb Mon Sep 17 00:00:00 2001 From: Samir Hafez Date: Sun, 21 Mar 2021 22:52:17 +0000 Subject: [PATCH 79/81] rofi: Add option to symlink dmenu (#107146) Co-authored-by: Sandro --- pkgs/applications/misc/rofi/wrapper.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix index 6115544e79f..2f98fe16416 100644 --- a/pkgs/applications/misc/rofi/wrapper.nix +++ b/pkgs/applications/misc/rofi/wrapper.nix @@ -1,4 +1,4 @@ -{ symlinkJoin, lib, rofi-unwrapped, makeWrapper, wrapGAppsHook, gdk-pixbuf, hicolor-icon-theme, theme ? null, plugins ? [] }: +{ symlinkJoin, lib, rofi-unwrapped, makeWrapper, wrapGAppsHook, gdk-pixbuf, hicolor-icon-theme, theme ? null, plugins ? [], symlink-dmenu ? false }: symlinkJoin { name = "rofi-${rofi-unwrapped.version}"; @@ -29,6 +29,8 @@ symlinkJoin { ${lib.optionalString (theme != null) ''--add-flags "-theme ${theme}"''} \ ${lib.optionalString (plugins != []) ''--add-flags "-plugin-path $out/lib/rofi"''} + ${lib.optionalString symlink-dmenu "ln -s ${rofi-unwrapped}/bin/rofi $out/bin/dmenu"} + rm $out/bin/rofi-theme-selector makeWrapper ${rofi-unwrapped}/bin/rofi-theme-selector $out/bin/rofi-theme-selector \ --prefix XDG_DATA_DIRS : $out/share From c78e0e376c7175cfc00ed38684e1b4d9b54acaf6 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 21 Mar 2021 14:45:38 +0800 Subject: [PATCH 80/81] plasma-systemmonitor: init at 5.21.1 --- pkgs/desktops/plasma-5/default.nix | 1 + .../plasma-5/plasma-systemmonitor.nix | 32 +++++++++++++++++++ pkgs/top-level/aliases.nix | 30 +++++++++++++---- 3 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 pkgs/desktops/plasma-5/plasma-systemmonitor.nix diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 71826e730b5..82985523c45 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -131,6 +131,7 @@ let plasma-integration = callPackage ./plasma-integration {}; plasma-nm = callPackage ./plasma-nm {}; plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; + plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { }; plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { }; plasma-vault = callPackage ./plasma-vault {}; plasma-workspace = callPackage ./plasma-workspace {}; diff --git a/pkgs/desktops/plasma-5/plasma-systemmonitor.nix b/pkgs/desktops/plasma-5/plasma-systemmonitor.nix new file mode 100644 index 00000000000..6b875745d27 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-systemmonitor.nix @@ -0,0 +1,32 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, qtquickcontrols2 +, kconfig +, kcoreaddons +, ki18n +, kiconthemes +, kitemmodels +, kitemviews +, knewstuff +, libksysguard +, qtbase +}: + +mkDerivation { + name = "plasma-systemmonitor"; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + qtquickcontrols2 + kconfig + kcoreaddons + ki18n + kitemmodels + kitemviews + knewstuff + kiconthemes + libksysguard + ]; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5f792755300..6795cedf949 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -945,13 +945,29 @@ mapAliases ({ yakuake ; inherit (plasma5Packages) - bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover - kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 - kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard - kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration - plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace - plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm - systemsettings xdg-desktop-portal-kde + bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth + discover + kactivitymanagerd + kde-cli-tools kde-gtk-config kdeplasma-addons + kgamma5 + kinfocenter + kmenuedit + kscreen kscreenlocker ksshaskpass ksysguard + kwallet-pam kwayland-integration kwin kwrited + milou + oxygen + plasma-browser-integration + plasma-desktop + plasma-integration + plasma-nm + plasma-pa + plasma-systemmonitor + plasma-thunderbolt + plasma-vault + plasma-workspace plasma-workspace-wallpapers + polkit-kde-agent powerdevil + sddm-kcm systemsettings + xdg-desktop-portal-kde ; inherit (plasma5Packages.thirdParty) plasma-applet-caffeine-plus From ed9ddeb1426f4198abed10bbbe41a033a8b22f3e Mon Sep 17 00:00:00 2001 From: Sebastian Zivota Date: Mon, 22 Mar 2021 01:15:25 +0100 Subject: [PATCH 81/81] vulkan-validation-layers: fix bug related to XDG_DATA_DIRS (#106085) --- pkgs/development/tools/vulkan-validation-layers/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index fdf66004deb..adec30a14c5 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -86,11 +86,6 @@ stdenv.mkDerivation rec { "-DBUILD_LAYER_SUPPORT_FILES=ON" ]; - # Help vulkan-loader find the validation layers - setupHook = writeText "setup-hook" '' - export XDG_DATA_DIRS=@out@/share:$XDG_DATA_DIRS - ''; - # Include absolute paths to layer libraries in their associated # layer definition json files. patchPhase = ''