From b792e696e83af74c422e35502b736da806343b62 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 9 Jan 2022 10:09:47 +0800 Subject: [PATCH 01/15] ping: mark as broken Does not build with vala 0.48 or later, upstream has no activity since 28 Dec 2020 --- pkgs/applications/networking/ping/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ping/default.nix b/pkgs/applications/networking/ping/default.nix index 8b8748d70ff3..6074b1a51ccb 100644 --- a/pkgs/applications/networking/ping/default.nix +++ b/pkgs/applications/networking/ping/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , meson @@ -14,7 +15,6 @@ , libsoup , libgee , wrapGAppsHook -, vala_0_40 }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - vala_0_40 + vala pkg-config python3 wrapGAppsHook @@ -65,5 +65,12 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl3; mainProgram = "com.github.jeremyvaartjes.ping"; + # Does not build with vala 0.48 or later + # ../src/Application.vala:696.46-696.57: error: Assignment: Cannot convert from + # `GLib.HashTable' to `GLib.HashTable?' + # HashTable tempDataList = Soup.Form.decode(testObjs[id].data); + # ^^^^^^^^^^^^ + # Upstream has no activity since 28 Dec 2020 + broken = true; }; } From 8d1d80520c85da0edac546387db336485721abd5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 9 Jan 2022 10:15:33 +0800 Subject: [PATCH 02/15] xfce.xfce4-namebar-plugin: mark as broken Does not build with vala 0.48 or later, upstream has no activity since 20 May 2020 --- .../xfce4-namebar-plugin/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix index 3f749c85b24e..ec64a60fb54a 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkg-config, fetchFromGitHub, python3, vala_0_40 +{ lib, stdenv, pkg-config, fetchFromGitHub, python3, vala , gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce }: stdenv.mkDerivation rec { @@ -12,13 +12,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-aKrJzf9rwCyXAJsRIXdBzmJBASuXD5I5kZrp+atx4FA="; }; - # Does not build with vala 0.48 or later - # Upstream has no activity for a while - # libxfce4panel-2.0.vapi:92.3-92.41: error: overriding method `Xfce.PanelPlugin.remote_event' is incompatible - # with base method `bool Xfce.PanelPluginProvider.remote_event (string, GLib.Value, uint)': too few parameters. - # public virtual signal bool remote_event (string name, GLib.Value value); - # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - nativeBuildInputs = [ pkg-config vala_0_40 wafHook python3 ]; + nativeBuildInputs = [ pkg-config vala wafHook python3 ]; buildInputs = [ gtk3 libwnck libxfce4util xfce4-panel ]; postPatch = '' @@ -39,5 +33,12 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ volth ] ++ teams.xfce.members; + # Does not build with vala 0.48 or later + # libxfce4panel-2.0.vapi:92.3-92.41: error: overriding method `Xfce.PanelPlugin.remote_event' is incompatible + # with base method `bool Xfce.PanelPluginProvider.remote_event (string, GLib.Value, uint)': too few parameters. + # public virtual signal bool remote_event (string name, GLib.Value value); + # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + # Upstream has no activity since 20 May 2020 + broken = true; }; } From 2a9cc2a9e612b0f5854c08329e48d0a18511efb3 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 9 Jan 2022 10:21:25 +0800 Subject: [PATCH 03/15] vala_0_40: drop --- pkgs/development/compilers/vala/default.nix | 19 +- .../vala/disable-graphviz-0.40.12.patch | 208 ------------------ pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 227 deletions(-) delete mode 100644 pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index daa9bf49b656..330510123f08 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -15,19 +15,7 @@ let # header file isn't available at all, but that patch (./gvc-compat.patch) # can be shared between all versions of Vala so far. graphvizPatch = - let - fp = { commit, sha256 }: fetchpatch { - url = "https://github.com/openembedded/openembedded-core/raw/${commit}/meta/recipes-devtools/vala/vala/disable-graphviz.patch"; - inherit sha256; - }; - - in { - - # NOTE: the openembedded-core project doesn't have a patch for 0.40.12 - # We've fixed the single merge conflict in the following patch. - # 0.40.12: https://github.com/openembedded/openembedded-core/raw/8553c52f174af4c8c433c543f806f5ed5c1ec48c/meta/recipes-devtools/vala/vala/disable-graphviz.patch - "0.40" = ./disable-graphviz-0.40.12.patch; - + { "0.48" = ./disable-graphviz-0.46.1.patch; "0.52" = ./disable-graphviz-0.46.1.patch; @@ -98,11 +86,6 @@ let }); in rec { - vala_0_40 = generic { - version = "0.40.25"; - sha256 = "1pxpack8rrmywlf47v440hc6rv3vi8q9c6niwqnwikxvb2pwf3w7"; - }; - vala_0_48 = generic { version = "0.48.21"; sha256 = "sha256-MFRVrrdo1u2bAYNgtVGC5IsW2xvBY6TluBQg+Y0h2Zg="; diff --git a/pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch b/pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch deleted file mode 100644 index fdc1eabf513e..000000000000 --- a/pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch +++ /dev/null @@ -1,208 +0,0 @@ -diff --git i/configure.ac w/configure.ac -index 694ffd200..915062053 100644 ---- i/configure.ac -+++ w/configure.ac -@@ -112,34 +112,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) - AC_SUBST(GMODULE_CFLAGS) - AC_SUBST(GMODULE_LIBS) - --PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) --AC_MSG_CHECKING([for CGRAPH]) --cgraph_tmp_LIBADD="$LIBADD" --cgraph_tmp_CFLAGS="$CFLAGS" --LIBADD="$LIBADD $LIBGVC_LIBS" --CFLAGS="$CFLAGS $LIBGVC_CFLAGS" --AC_RUN_IFELSE( -- [AC_LANG_SOURCE([ -- #include -- -- int main(void) { -- #ifdef WITH_CGRAPH -- return 0; -- #else -- return -1; -- #endif -- } -- ])], [ -- AC_MSG_RESULT([yes]) -- VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" -- have_cgraph=yes -- ], [ -- AC_MSG_RESULT([no]) -- have_cgraph=no -- ] --) --LIBADD="$cgraph_tmp_LIBADD" --CFLAGS="$cgraph_tmp_CFLAGS" -+AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes) -+if test x$enable_graphviz = xyes; then -+ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) -+ AC_MSG_CHECKING([for CGRAPH]) -+ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ" -+ cgraph_tmp_LIBADD="$LIBADD" -+ cgraph_tmp_CFLAGS="$CFLAGS" -+ LIBADD="$LIBADD $LIBGVC_LIBS" -+ CFLAGS="$CFLAGS $LIBGVC_CFLAGS" -+ AC_RUN_IFELSE( -+ [AC_LANG_SOURCE([ -+ #include -+ int main(void) { -+ #ifdef WITH_CGRAPH -+ return 0; -+ #else -+ return -1; -+ #endif -+ } -+ ])], [ -+ AC_MSG_RESULT([yes]) -+ VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" -+ have_cgraph=yes -+ ], [ -+ AC_MSG_RESULT([no]) -+ have_cgraph=no -+ ] -+ ) -+ LIBADD="$cgraph_tmp_LIBADD" -+ CFLAGS="$cgraph_tmp_CFLAGS" -+fi -+AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes) - AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") - - AC_PATH_PROG([XSLTPROC], [xsltproc], :) -diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am -index f3f790e76..3c5dc4c80 100644 ---- i/libvaladoc/Makefile.am -+++ w/libvaladoc/Makefile.am -@@ -128,10 +128,6 @@ libvaladoc_la_VALASOURCES = \ - content/tablerow.vala \ - content/taglet.vala \ - content/text.vala \ -- charts/chart.vala \ -- charts/chartfactory.vala \ -- charts/hierarchychart.vala \ -- charts/simplechartfactory.vala \ - parser/manyrule.vala \ - parser/oneofrule.vala \ - parser/optionalrule.vala \ -@@ -158,13 +154,24 @@ libvaladoc_la_VALASOURCES = \ - highlighter/codetoken.vala \ - highlighter/highlighter.vala \ - html/basicdoclet.vala \ -- html/htmlchartfactory.vala \ - html/linkhelper.vala \ - html/cssclassresolver.vala \ - html/htmlmarkupwriter.vala \ - html/htmlrenderer.vala \ - $(NULL) - -+if ENABLE_GRAPHVIZ -+libvaladoc_la_VALASOURCES += \ -+ charts/chart.vala \ -+ charts/chartfactory.vala \ -+ charts/hierarchychart.vala \ -+ charts/simplechartfactory.vala \ -+ html/htmlchartfactory.vala \ -+ $(NULL) -+ -+LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc -+endif -+ - libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ - libvaladoc.vala.stamp \ - $(libvaladoc_la_VALASOURCES:.vala=.c) \ -@@ -184,11 +191,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) - --library valadoc \ - --vapi valadoc@PACKAGE_SUFFIX@.vapi \ - --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \ -- --vapidir $(top_srcdir)/vapi --pkg libgvc \ - --vapidir $(top_srcdir)/gee --pkg gee \ - --vapidir $(top_srcdir)/vala --pkg vala \ - --vapidir $(top_srcdir)/ccode --pkg ccode \ - --vapidir $(top_srcdir)/codegen --pkg codegen \ -+ $(LIBGVC_PKG) \ - --pkg config \ - $(filter %.vala %.c,$^) - touch $@ -@@ -217,6 +224,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc - - valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc - cp $< $@ -+if !ENABLE_GRAPHVIZ -+ sed -i "s/libgvc //g" $@ -+endif - - vapidir = $(datadir)/vala/vapi - dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi -@@ -224,6 +234,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps - - valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps - cp $< $@ -+if !ENABLE_GRAPHVIZ -+ sed -i "s/libgvc//g" $@ -+endif - - EXTRA_DIST = \ - $(libvaladoc_la_VALASOURCES) \ -diff --git i/libvaladoc/html/basicdoclet.vala w/libvaladoc/html/basicdoclet.vala -index 192e488cd..ec0960222 100644 ---- i/libvaladoc/html/basicdoclet.vala -+++ w/libvaladoc/html/basicdoclet.vala -@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - protected HtmlRenderer _renderer; - protected Html.MarkupWriter writer; - protected Html.CssClassResolver cssresolver; -+#if HAVE_GRAPHVIZ - protected Charts.Factory image_factory; -+#else -+ protected void* image_factory; -+#endif - protected ErrorReporter reporter; - protected string package_list_link = "../index.html"; - -@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - this.linker = new LinkHelper (); - - _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver); -+#if HAVE_GRAPHVIZ - this.image_factory = new SimpleChartFactory (settings, linker); -+#endif - } - - -@@ -1026,6 +1032,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - } - - protected void write_image_block (Api.Node element) { -+#if HAVE_GRAPHVIZ - if (element is Class || element is Interface || element is Struct) { - unowned string format = (settings.use_svg_images ? "svg" : "png"); - var chart = new Charts.Hierarchy (image_factory, element); -@@ -1045,6 +1052,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { - this.get_img_path_html (element, format)}); - writer.add_usemap (chart); - } -+#endif - } - - public void write_namespace_content (Namespace node, Api.Node? parent) { -diff --git i/libvaladoc/html/htmlmarkupwriter.vala w/libvaladoc/html/htmlmarkupwriter.vala -index dcc4dad76..cf9c860b8 100644 ---- i/libvaladoc/html/htmlmarkupwriter.vala -+++ w/libvaladoc/html/htmlmarkupwriter.vala -@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { - } - } - -+#if HAVE_GRAPHVIZ - public MarkupWriter add_usemap (Charts.Chart chart) { - string? buf = (string?) chart.write_buffer ("cmapx"); - if (buf != null) { - raw_text ("\n"); - raw_text ((!) buf); - } -+#else -+ public MarkupWriter add_usemap (void* chart) { -+#endif - - return this; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82bd5f88666f..8188fde1a23d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13262,7 +13262,6 @@ with pkgs; vala-lint = callPackage ../development/tools/vala-lint { }; inherit (callPackage ../development/compilers/vala { }) - vala_0_40 vala_0_48 vala_0_52 vala_0_54 From c702c4178cecf0ed02191a6ff0370e305539f2ad Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 10 Jan 2022 12:01:03 +0800 Subject: [PATCH 04/15] =?UTF-8?q?vala=5F0=5F52:=200.52.9=20=E2=86=92=200.5?= =?UTF-8?q?2.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vala/raw/0.52.10/NEWS --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 330510123f08..725e53bee584 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -92,8 +92,8 @@ in rec { }; vala_0_52 = generic { - version = "0.52.9"; - sha256 = "sha256-HpMH2B4hHxniUB6P5PtN0Z+5J8SEtV/873FOjFFdAHk="; + version = "0.52.10"; + sha256 = "sha256-nCAb+BLZh04hveU/jZwU9lF0ixqBRB/1ySkSJESQEAg="; }; vala_0_54 = generic { From b3e513875f79a2fed883ee7054c1e8368da44c81 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 10 Jan 2022 12:22:42 +0800 Subject: [PATCH 05/15] =?UTF-8?q?vala=5F0=5F48:=200.48.21=20=E2=86=92=200.?= =?UTF-8?q?48.22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vala/raw/0.48.22/NEWS --- pkgs/development/compilers/vala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 725e53bee584..9a1365d0c964 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -87,8 +87,8 @@ let in rec { vala_0_48 = generic { - version = "0.48.21"; - sha256 = "sha256-MFRVrrdo1u2bAYNgtVGC5IsW2xvBY6TluBQg+Y0h2Zg="; + version = "0.48.22"; + sha256 = "sha256-27NHjEvjZvCTFkrGHNOu29zz5EQE2eNkFK4VEk525os="; }; vala_0_52 = generic { From 89794b91f34c6a456b6ac748dc39a72a2d2cb480 Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Thu, 13 Jan 2022 09:26:49 +0100 Subject: [PATCH 06/15] ammonite: 2.5.0 -> 2.5.1 --- pkgs/development/tools/ammonite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 13b0e8d25705..784a87233362 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -9,7 +9,7 @@ let common = { scalaVersion, sha256 }: stdenv.mkDerivation rec { pname = "ammonite"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { url = @@ -83,10 +83,10 @@ let in { ammonite_2_12 = common { scalaVersion = "2.12"; - sha256 = "sha256-JTW1xb+eCb0yhzrA1ntmalP88JoUo+KrjOBvs+cuE/A="; + sha256 = "sha256-XV+SPZD7IirLJDqwn/eV8/Wf8m3dSSW0DF3IcBPcixA="; }; ammonite_2_13 = common { scalaVersion = "2.13"; - sha256 = "sha256-l5kGPP8tuYi16t6u8ZeAY54yqAWJZR5UuopSGQ69v9Y="; + sha256 = "sha256-rq8SLtj0rb35vcvPsCzhDGR93EjHoU6KAhEjs2WIA6o="; }; } From cd4acca2e22c33cfe3b03fc9370925dad6c9dfea Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 16 Jan 2022 19:51:27 +0000 Subject: [PATCH 07/15] btrfs-progs: 5.14.1 -> 5.16 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index bdd26041d33a..ccaebd73f53f 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchurl, pkg-config, attr, acl, zlib, libuuid, e2fsprogs, lzo -, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3 +{ lib, stdenv, fetchurl +, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, pkg-config, python3, xmlto +, zstd +, acl, attr, e2fsprogs, libuuid, lzo, systemd, zlib }: stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.14.1"; + version = "5.16"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-1UqTRlRcpG3xKOPMt31gwJfZDJO34xSZAjbijPr4xVs="; + sha256 = "0cqqlcq9bywfi3cpg5ivxiv7p9v6z1r6k4nnmin24mj1kp8krarq"; }; nativeBuildInputs = [ @@ -16,7 +18,7 @@ stdenv.mkDerivation rec { python3 python3.pkgs.setuptools ]; - buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd python3 ]; + buildInputs = [ acl attr e2fsprogs libuuid lzo python3 systemd zlib zstd ]; # for python cross-compiling _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config; @@ -31,6 +33,8 @@ stdenv.mkDerivation rec { configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace"; + makeFlags = [ "udevruledir=$(out)/lib/udev/rules.d" ]; + meta = with lib; { description = "Utilities for the btrfs filesystem"; homepage = "https://btrfs.wiki.kernel.org/"; From fc2c685b2bad7d3a5cdf173223d960749442847d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 16 Jan 2022 19:52:08 +0000 Subject: [PATCH 08/15] btrfs-progs: enable parallel building Tested at -j8. --- pkgs/tools/filesystems/btrfs-progs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index ccaebd73f53f..cb5638247fa7 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { makeFlags = [ "udevruledir=$(out)/lib/udev/rules.d" ]; + enableParallelBuilding = true; + meta = with lib; { description = "Utilities for the btrfs filesystem"; homepage = "https://btrfs.wiki.kernel.org/"; From a5ff1dc05df78ba4c8dfcbe2fc818524ed950fe3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 16 Jan 2022 19:52:25 +0000 Subject: [PATCH 09/15] btrfs-progs: clarify license --- pkgs/tools/filesystems/btrfs-progs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index cb5638247fa7..9ad343f60a8c 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utilities for the btrfs filesystem"; homepage = "https://btrfs.wiki.kernel.org/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; From 607053245155f6a337707887996ca0b39321e21f Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Mon, 17 Jan 2022 09:22:21 +0100 Subject: [PATCH 10/15] mautrix-whatsapp: 0.2.2 -> 0.2.3 --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index d0d11f0937de..7579db1c090d 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGo117Module rec { pname = "mautrix-whatsapp"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - sha256 = "sha256-W+5DtCp7P/0azfusv+Nt3G9VcWKPUxVJmNwSfPjxjbw="; + sha256 = "sha256-vMRmxu1TNCw5c+PuSdAPdMJpZGLdcCTzpTNz/AFrWi8="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-maGnlnxyhrvW0NkHmHWEvNge5c/HxLDm8NuWR6zcdYg="; + vendorSha256 = "sha256-bvbZ7Tnd6s6zr9trN4egR/9KV5cU09mQI+U1UxyYzlE="; doCheck = false; From f32154da149de645bcbe02f6d80a1a71427c67e4 Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Mon, 17 Jan 2022 21:31:23 +1100 Subject: [PATCH 11/15] spot: 0.2.2 -> 0.3.0 https://github.com/xou816/spot/releases/tag/0.3.0 --- pkgs/applications/audio/spot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/applications/audio/spot/default.nix index e17e85036949..e91cc9cc0207 100644 --- a/pkgs/applications/audio/spot/default.nix +++ b/pkgs/applications/audio/spot/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation rec { pname = "spot"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "xou816"; repo = "spot"; rev = version; - hash = "sha256-g0oVhlfez9i+Vv8lt/aNftCVqdgPMDySBBeLyOv7Zl8="; + hash = "sha256-An9PJsuXZkvJhP67cisWxFd2dpky53EY/xcR6StgWFY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-n10aYzkRqEe1h2WPAfARjH79Npvv+3fdX9jCtxv2a34="; + hash = "sha256-2qMmPIBoZS6WT06VzCmnYWaIfLzWN2HUvk7y9GKuuXg="; }; nativeBuildInputs = [ From a6f61081493fa1f3941c0faa0b1b28401ca46b3d Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Mon, 17 Jan 2022 12:20:22 +0100 Subject: [PATCH 12/15] inkscape: fix line spacing problem Inkscape does not work well with with Pango 1.49+ (nixpkgs has Pango 1.50.0). An upstream commit with the fix will be a part of upcomming 1.1.2 release due in a month. Until than, let's apply the fix in nixpkgs. --- pkgs/applications/graphics/inkscape/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index b93a0fcaff84..d3546f609520 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -81,6 +81,14 @@ stdenv.mkDerivation rec { stripLen = 1; extraPrefix = "share/extensions/"; }) + # Remove mandatory break from end of paragraphs, added in Pango 1.49 + # https://gitlab.com/inkscape/inkscape/-/merge_requests/3630 + # TODO: Remove in Inkscape 1.1.2 + (fetchpatch { + url = "https://gitlab.com/inkscape/inkscape/-/commit/b3dabef2245d4e4e977ee9d6776be9a134493515.patch"; + sha256 = "YhqUlRBKL1vJ/iCM/DvdwbmPIsAHQpcgf4TPpjlnBng="; + }) + ]; postPatch = '' From 9049874ff1e79408862d0ca7b854315c20526c73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Mon, 17 Jan 2022 15:24:45 +0100 Subject: [PATCH 13/15] uriparser: Fix cross building When cross building, we need to disable building tests or cmake will complain about the missing gtest. Also switching from targetPlatform to buildPlatform caused doCheck to be properly set to false --- pkgs/development/libraries/uriparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index 0c48c6500c53..28eea0525176 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DURIPARSER_BUILD_DOCS=OFF" - ]; + ] ++ lib.optional (!doCheck) "-DURIPARSER_BUILD_TESTS=OFF"; checkInputs = [ gtest ]; - doCheck = stdenv.targetPlatform.system == stdenv.hostPlatform.system; + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; meta = with lib; { homepage = "https://uriparser.github.io/"; From 966a7403df58a4a72295bce08414de90bb80bbc6 Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Mon, 17 Jan 2022 23:26:26 +0800 Subject: [PATCH 14/15] btop: 1.1.4 -> 1.2.0 --- pkgs/tools/system/btop/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index 50ea70ae48dd..7002976e3d05 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -8,13 +8,14 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.1.4"; + version = "1.2.0"; + hash = "qNm0mzPPh6jYIJX1W+macIDiGyWT+0jk7O0jCmvV/S4="; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "1q8rp34fjbg9abbw5v6l5h9cmvzqq05cmkgavh8qd5xyimsx3xyh"; + sha256 = hash; }; hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; From 721a4a296e997c28483beaa213ff4c5a0985f0ce Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 17 Jan 2022 16:36:37 +0100 Subject: [PATCH 15/15] python2Packages: remove imports of files that no longer exist --- pkgs/top-level/python2-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 4ef13ef604f6..4a15b64da09f 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -174,10 +174,6 @@ with self; with super; { vcrpy = callPackage ../development/python2-modules/vcrpy { }; - yenc = callPackage ../development/python2-modules/yenc { }; - - yt = callPackage ../development/python2-modules/yt { }; - zeek = disabled super.zeek; zipp = callPackage ../development/python2-modules/zipp { };