From 7e6d80740d01dd42f1684cbb64d0f236e69dd3c8 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 11 Oct 2021 23:13:09 +0200 Subject: [PATCH 01/36] chromium: Start dropping Python 2 --- pkgs/applications/networking/browsers/chromium/common.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4b7fbc38bbcc..e269d6313ae1 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -53,9 +53,6 @@ buildFun: with lib; let - python2WithPackages = python2.withPackages(ps: with ps; [ - ply jinja2 setuptools - ]); python3WithPackages = python3.withPackages(ps: with ps; [ ply jinja2 setuptools ]); @@ -125,7 +122,7 @@ let nativeBuildInputs = [ ninja pkg-config - python2WithPackages python3WithPackages perl + python2 python3WithPackages perl gnutar which llvmPackages.bintools ]; @@ -308,7 +305,7 @@ let # This is to ensure expansion of $out. libExecPath="${libExecPath}" - ${python2}/bin/python2 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} + ${python3}/bin/python3 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt # Fail if `gn gen` contains a WARNING. From ee1e2d645168c3bb4a2ee33a682e0337c69f48e9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 12 Oct 2021 01:38:08 +0000 Subject: [PATCH 02/36] hubstaff: 1.6.1-20f4dbb0 -> 1.6.2-b5029032 --- pkgs/applications/misc/hubstaff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 3eb41f5ebe5e..3ff33a14f2e8 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -4,9 +4,9 @@ , curl, writeShellScript, common-updater-scripts }: let - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.1-20f4dbb0/Hubstaff-1.6.1-20f4dbb0.sh"; - version = "1.6.1-20f4dbb0"; - sha256 = "097hpr4sjh14pidflvs8n1mkjpmij9l2vaan4m82vjrr0qdqi8qy"; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.2-b5029032/Hubstaff-1.6.2-b5029032.sh"; + version = "1.6.2-b5029032"; + sha256 = "1q3gimg6bcpdnm1fkn1vq3b6shwgi6y84bixisyfcva5px7dmi4s"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft From 7b6ebef68e4afc472ef97eed47bfb4b56ffb4002 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 12 Oct 2021 10:22:29 +0000 Subject: [PATCH 03/36] python38Packages.intensity-normalization: 2.0.2 -> 2.0.3 --- .../python-modules/intensity-normalization/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix index d884e7ff45cc..e3f09860e89e 100644 --- a/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/pkgs/development/python-modules/intensity-normalization/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "intensity-normalization"; - version = "2.0.2"; + version = "2.0.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f963e90671fec51d1b248862a9bcc4639c1d6d3b1dbc1ee34d042cb765d8730a"; + sha256 = "d6f2ac360f51f5314e690272cb26c454e6deab69ef48a7c650ea760247d1d4db"; }; postPatch = '' From 46e7f53a42a0322995b0771fa97a3bdc55c7ce72 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 12 Oct 2021 18:27:27 +0000 Subject: [PATCH 04/36] python38Packages.structlog: 21.1.0 -> 21.2.0 --- pkgs/development/python-modules/structlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index dc7aea0c3bf9..3d1a8f8af674 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "structlog"; - version = "21.1.0"; + version = "21.2.0"; src = fetchPypi { inherit pname version; - sha256 = "d9d2d890532e8db83c6977a2a676fb1889922ff0c26ad4dc0ecac26f9fafbc57"; + sha256 = "7ac42b565e1295712313f91edbcb64e0840a9037d888c8954f11fa6c43270e99"; }; checkInputs = [ pytest pytest-asyncio pretend freezegun simplejson twisted ] From 0ff9c5e3e2580d40699e49ce6d9eb3e909a7b330 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 13 Oct 2021 09:20:19 +0000 Subject: [PATCH 05/36] python38Packages.google-cloud-appengine-logging: 0.1.5 -> 1.0.0 --- .../python-modules/google-cloud-appengine-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 8f9570530911..0bfd6945b128 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "0.1.5"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "9d31647238a8ee05abd0a860bf333ccdda3d6540059fbf3c75c28cf58ee8dc4e"; + sha256 = "f10760c7df7052e63a79547b36fb439ab8a0f72fe28ff8356a0755c45ab75412"; }; propagatedBuildInputs = [ From 2431d1cceb68ecf224fdec5f13d4b391dd75e77b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 13 Oct 2021 09:35:34 +0000 Subject: [PATCH 06/36] python38Packages.google-cloud-bigquery-logging: 0.2.2 -> 1.0.0 --- .../python-modules/google-cloud-bigquery-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 9e46a9ecf3c4..60aea98d9b01 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "0.2.2"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "2dc15be4fdcd574c23124bfc0a678c864581038c96b86275c7b41d9fced06534"; + sha256 = "a85d11c28733792ee55218fce7786f51fdd013c79ff1d92531ffd50a8a51692c"; }; propagatedBuildInputs = [ From 49570f737620d85af51a8ba9f4fde21b9eb1f5ab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 13 Oct 2021 14:38:46 +0000 Subject: [PATCH 07/36] python38Packages.mypy-boto3-s3: 1.18.59 -> 1.18.60 --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 32039728eb7e..17f3ff34ba5b 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.18.59"; + version = "1.18.60"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "900615dd82ba9267ccf531734a1422272ac7b53d3256c17acea6c620fbe8ca1e"; + sha256 = "4881fdbb41a74a15076c12285abd925a40e29d9f1b06d92b4d7cb12e8d208ae0"; }; propagatedBuildInputs = [ From 32555b6200825b8301742c0e8f00b562bf16a050 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 13 Oct 2021 16:53:06 +0200 Subject: [PATCH 08/36] gzdoom: 4.5.0 -> 4.7.0 build with fluidsynth 2 --- pkgs/games/gzdoom/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 787184273fc3..beba37c07aca 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth_1 +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth , soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, mpg123 , game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem }: @@ -28,13 +28,13 @@ let gzdoom = stdenv.mkDerivation rec { pname = "gzdoom"; - version = "4.5.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "0kmqnyhdi5psi7zwrx9j3pz0cplypsvhg4cr8w2jbawh6jb71sk9"; + sha256 = "0xxxy7k2zr5g0vr1lnwv4n5amiwq1wln7r6hr37gmrjr72zkcjqn"; fetchSubmodules = true; }; @@ -43,7 +43,7 @@ let SDL2 libGL openal - fluidsynth_1 + fluidsynth bzip2 zlib libjpeg From 305ea3e9ede5429f2902c1543397cfb60db03e28 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Wed, 13 Oct 2021 09:39:35 -0600 Subject: [PATCH 09/36] nixos/nvidia: fix typo in PM assert --- nixos/modules/hardware/video/nvidia.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index b9eb7f69ef43..8f6b5c22ea4f 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -213,7 +213,7 @@ in } { - assertion = cfg.powerManagement.enable -> offloadCfg.enable; + assertion = cfg.powerManagement.finegrained -> offloadCfg.enable; message = "Fine-grained power management requires offload to be enabled."; } From 871e855cb78c43651b993264a539d28aa03c810e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Oct 2021 17:48:28 +0200 Subject: [PATCH 10/36] gnome.nautilus: add dev output So that propagatedBuildInputs do not pull gnome-autoar.dev into the out closure. --- pkgs/desktops/gnome/core/nautilus/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index a65eb44eed01..2a964964a09e 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { pname = "nautilus"; version = "41.0"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; sha256 = "+blBrcEEcAxn6kB2YiMV8fa3fc7BVMN/PUwLKDlQoeU="; From 7ae3ae5aabe660cb727d3e14cb247ac1509c7705 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Oct 2021 17:49:11 +0200 Subject: [PATCH 11/36] libgxps: add dev output So that propagatedBuildInputs do not pull libarchive.dev into the out closure. --- pkgs/development/libraries/libgxps/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix index df05754da589..397939103400 100644 --- a/pkgs/development/libraries/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -6,6 +6,8 @@ stdenv.mkDerivation rec { pname = "libgxps"; version = "0.3.2"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "bSeGclajXM+baSU+sqiKMrrKO5fV9O9/guNmf6Q1JRw="; From 5e175ea138cb75949dd54f91d0335dfb1aaa08fc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 13 Oct 2021 18:11:43 +0200 Subject: [PATCH 12/36] python3Packages.aioesphomeapi: 9.1.5 -> 10.0.0 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 3d40e7ff52b8..5b69a3326155 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "9.1.5"; + version = "10.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PPag65ZMz9KZEe9FmiB42/DgeM0vJw5L0haAG/jBjqg="; + sha256 = "sha256-ZVexJt1CE7Q0j9QzrPFLYYSXzoWYtfw1BWwL/hnAkD0="; }; propagatedBuildInputs = [ From dc6d7cd3f0bbde277b96fffa3da0c9ccb06fb60f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Oct 2021 18:24:14 +0200 Subject: [PATCH 13/36] adwaita-qt: add dev output So that gtk3.dev is not included in the closure through CMake files. --- pkgs/data/themes/adwaita-qt/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index 3e72d8a74b8a..f1424b15ad1a 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -14,6 +14,8 @@ mkDerivation rec { pname = "adwaita-qt"; version = "1.4.0"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "FedoraQt"; repo = pname; From 758fa38581f8c2b62b46ebf2c044c9ed9b234862 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Oct 2021 18:26:22 +0200 Subject: [PATCH 14/36] python3.pkgs.dogtail: add dev output So that propagatedBuildInputs do not pull gtk3.dev into the out closure. --- pkgs/development/python-modules/dogtail/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix index 808c2916ddd9..fb513a20c654 100644 --- a/pkgs/development/python-modules/dogtail/default.nix +++ b/pkgs/development/python-modules/dogtail/default.nix @@ -19,6 +19,8 @@ buildPythonPackage { pname = "dogtail"; version = "0.9.11"; + outputs = [ "out" "dev" ]; + # https://gitlab.com/dogtail/dogtail/issues/1 # src = fetchPypi { # inherit pname version; From 050a1d0a6e7b40d67742c3870f00bac05ac859f1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Oct 2021 18:40:00 +0200 Subject: [PATCH 15/36] python3.pkgs.dogtail: add dev output So that propagatedBuildInputs do not pull gupnp.dev into the out closure. --- pkgs/development/libraries/dleyna-core/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix index 4a4eecfdc0f2..e8e384ac2a00 100644 --- a/pkgs/development/libraries/dleyna-core/default.nix +++ b/pkgs/development/libraries/dleyna-core/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { pname = "dleyna-core"; version = "0.6.0"; + outputs = [ "out" "dev" ]; + setupHook = ./setup-hook.sh; src = fetchFromGitHub { From 22ab849288cabab48edcbfeb85271570ad9bffe1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Oct 2021 18:53:50 +0200 Subject: [PATCH 16/36] gnome.gnome-user-share: fix apache module path Also potentially reduces the number of dev dependencies in closure. --- pkgs/desktops/gnome/core/gnome-user-share/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/core/gnome-user-share/default.nix b/pkgs/desktops/gnome/core/gnome-user-share/default.nix index 211326cfcdbd..bab13a6ccd19 100644 --- a/pkgs/desktops/gnome/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome/core/gnome-user-share/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dhttpd=${apacheHttpd.out}/bin/httpd" - "-Dmodules_path=${apacheHttpd.dev}/modules" + "-Dmodules_path=${apacheHttpd}/modules" "-Dsystemduserunitdir=${placeholder "out"}/etc/systemd/user" # In 3.34.0 it defaults to false but it is silently ignored and always installed. # Let’s add it anyway in case they decide to make build respect the option in the future. From b479d8e6a5ca1b6359ad687bcf3555592ff34545 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Oct 2021 18:54:21 +0200 Subject: [PATCH 17/36] mate.mate-user-share: fix apache module path Also potentially reduces the number of dev dependencies in closure. --- pkgs/desktops/mate/mate-user-share/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 3e0062c7a793..264389a68836 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-httpd=${apacheHttpd.out}/bin/httpd" - "--with-modules-path=${apacheHttpd.dev}/modules" + "--with-modules-path=${apacheHttpd}/modules" "--with-cajadir=$(out)/lib/caja/extensions-2.0" ]; From ce639ad2d5cdd76cdd7dac77bc9c81a31e71943f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Oct 2021 19:07:51 +0200 Subject: [PATCH 18/36] gnome.gnome-music: move python dependencies to pythonPath It is deprecated but otherwise wrapPython adds everything that is propagated, including dev outputs, to program_PATH, which ends up in the wrapper. --- pkgs/desktops/gnome/apps/gnome-music/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix index ef0931e273c9..1468c1bde169 100644 --- a/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -79,13 +79,12 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-ugly ]); - propagatedBuildInputs = with python3.pkgs; [ + pythonPath = with python3.pkgs; [ pycairo dbus-python pygobject3 ]; - postPatch = '' for f in meson_post_conf.py meson_post_install.py; do chmod +x $f From 054d6d948618c292c04555323c06b64690318e3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 13 Oct 2021 18:33:34 +0200 Subject: [PATCH 19/36] netplan: 0.101 -> 0.103, fix package --- pkgs/tools/admin/netplan/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/netplan/default.nix b/pkgs/tools/admin/netplan/default.nix index b9dc2c070731..77f2ad26de1d 100644 --- a/pkgs/tools/admin/netplan/default.nix +++ b/pkgs/tools/admin/netplan/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "netplan"; - version = "0.101"; + version = "0.103"; src = fetchFromGitHub { - owner = "CanonicalLtd"; + owner = "canonical"; repo = "netplan"; rev = version; - hash = "sha256-bCK7J2pCQUwjZu8c1n6jhF6T/gvUGwydqAXpxUMLgMc="; + hash = "sha256-d8Ze8S/w2nyJkATzLfizMqmr7ad2wrK1mjADClee6WE="; fetchSubmodules = false; }; @@ -45,6 +45,9 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace 'SYSTEMD_GENERATOR_DIR=' 'SYSTEMD_GENERATOR_DIR ?= ' \ --replace 'SYSTEMD_UNIT_DIR=' 'SYSTEMD_UNIT_DIR ?= ' \ --replace 'BASH_COMPLETIONS_DIR=' 'BASH_COMPLETIONS_DIR ?= ' + + # from upstream https://github.com/canonical/netplan/blob/ee0d5df7b1dfbc3197865f02c724204b955e0e58/rpm/netplan.spec#L81 + sed -e "s/-Werror//g" -i Makefile ''; makeFlags = [ From c70f4c843d31e20d6673e4d63fdd40f4f9b7132c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Oct 2021 20:11:08 +0200 Subject: [PATCH 20/36] gnome.gnome-music: fix double wrapping --- pkgs/desktops/gnome/apps/gnome-music/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix index 1468c1bde169..96ec321fa4a9 100644 --- a/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -92,6 +92,13 @@ python3.pkgs.buildPythonApplication rec { done ''; + # Prevent double wrapping, let the Python wrapper use the args in preFixup. + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + doCheck = false; # handle setup hooks better From a6bff35d96b893f3b4ba378c7af086901493ae3a Mon Sep 17 00:00:00 2001 From: Kanashimia Date: Wed, 13 Oct 2021 20:02:10 +0300 Subject: [PATCH 21/36] lowdown: 0.9.0 -> 0.9.2 --- pkgs/tools/typesetting/lowdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index bbdb9c9b14f2..32907ea3fb75 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.9.0"; + version = "0.9.2"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "0v3l70c9mal67i369bk3q67qyn07kmclybcd5lj5ibdrrccq1jzsxn2sy39ziy77in7cygcb1lgf9vzacx9rscw94i6259fy0dpnf0h"; + sha512 = "2dnjyx3q46n7v1wl46vfgs9rhb3kvhijsd3ydq6amdf6vlf4mf1zsiakd5iycdh0i799zq61yspsibc87mcrs8l289lnwl955avs068"; }; nativeBuildInputs = [ which ] From 9922d6335511cdc9404a425f904b68a3063eda17 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Oct 2021 21:03:41 +0200 Subject: [PATCH 22/36] mod_dnssd: run {pre,post}Install hooks --- pkgs/servers/http/apache-modules/mod_dnssd/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index a0a6235ace50..df8c046d7e31 100644 --- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -20,8 +20,12 @@ stdenv.mkDerivation rec { }) ]; installPhase = '' + runHook preInstall + mkdir -p $out/modules cp src/.libs/mod_dnssd.so $out/modules + + runHook postInstall ''; meta = with lib; { From 345736016811b4109e92dd9802ccccc191e99356 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Oct 2021 21:04:15 +0200 Subject: [PATCH 23/36] mod_dnssd: strip debugging symbols Otherwise gnome-user-share and thus the whole GNOME will pull in apacheHttpd.dev & co. --- pkgs/servers/http/apache-modules/mod_dnssd/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index df8c046d7e31..4f4236e91b58 100644 --- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -28,6 +28,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; + preFixup = '' + # TODO: Packages in non-standard directories not stripped. + # https://github.com/NixOS/nixpkgs/issues/141554 + stripDebugList=modules + ''; + meta = with lib; { homepage = "http://0pointer.de/lennart/projects/mod_dnssd"; description = "Provide Zeroconf support via DNS-SD using Avahi"; From c70619eec8aefc4e4620eb5543bf10f93d4dedd8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 13 Oct 2021 15:40:15 +0000 Subject: [PATCH 24/36] python38Packages.pglast: 3.6 -> 3.7 --- .../development/python-modules/pglast/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index a4e50d1d4695..c3b34b1fc199 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -3,27 +3,32 @@ , fetchPypi , isPy3k , setuptools -, pytest-cov , pytest }: buildPythonPackage rec { pname = "pglast"; - version = "3.6"; + version = "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1594d536137b888556b7187d25355ba88b3a14ef0d8aacccef15bfed74cf0af9"; + sha256 = "3f0f36cebdb68d5b3aaacb11cbf09db44250194845fbf3b49b0aef93c30991bf"; }; disabled = !isPy3k; + # ModuleNotFoundError: No module named 'pkg_resources' propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytest pytest-cov ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=pglast --cov-report term-missing" "" + ''; - pythonImportsCheck = [ "pglast" ]; + checkInputs = [ pytest ]; + # pytestCheckHook doesn't work + # ImportError: cannot import name 'parse_sql' from 'pglast' checkPhase = '' pytest ''; From 45bf279eaa46a923eef23258db5ae8af4ad555b1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Oct 2021 21:14:11 +0200 Subject: [PATCH 25/36] gnome.gnome-tweaks: move python dependencies to pythonPath It is deprecated but otherwise wrapPython adds everything that is propagated, including dev outputs, to program_PATH, which ends up in the wrapper. --- pkgs/desktops/gnome/misc/gnome-tweaks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix index c220e7eeccd1..6a9f4f19385d 100644 --- a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix @@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec { libsoup ]; - propagatedBuildInputs = with python3Packages; [ + pythonPath = with python3Packages; [ pygobject3 ]; From ab9bbad9ea45608591a431301fe3bdc603fe2874 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Oct 2021 21:22:37 +0200 Subject: [PATCH 26/36] orca: move python dependencies to pythonPath It is deprecated but otherwise wrapPython adds everything that is propagated, including dev outputs, to program_PATH, which ends up in the wrapper. --- pkgs/applications/misc/orca/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index f8facbe01fa0..fe739cb581a3 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -65,7 +65,7 @@ buildPythonApplication rec { gobject-introspection ]; - propagatedBuildInputs = [ + pythonPath = [ pygobject3 pyatspi dbus-python From 9cb521994ec836a8a76258bedef6fc1409710d0c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 13 Oct 2021 17:27:56 +0000 Subject: [PATCH 27/36] markets: 0.5.2 -> 0.5.3 --- pkgs/applications/misc/markets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/markets/default.nix b/pkgs/applications/misc/markets/default.nix index bd9dd7ac9509..d1d16a7c8cbd 100644 --- a/pkgs/applications/misc/markets/default.nix +++ b/pkgs/applications/misc/markets/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "markets"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "bitstower"; repo = "markets"; rev = version; - sha256 = "0nk1bs7i6b7r90g5qwd3s2m462vk3kvza0drq7rzb5sdaiz9ccnz"; + sha256 = "0sfdmz7cp8i2bymippp8jyxsidxjn69v9cqm40q77j81kfm84bfv"; }; nativeBuildInputs = [ From c4b786be2d8d19cc59a9b676f4c62bd9ae5e733e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 13 Oct 2021 20:20:30 +0000 Subject: [PATCH 28/36] python38Packages.sunpy: 3.0.1 -> 3.0.2 --- pkgs/development/python-modules/sunpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 9b834fe5c5ba..943bbd22c7fb 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,12 +31,12 @@ buildPythonPackage rec { pname = "sunpy"; - version = "3.0.1"; + version = "3.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WpqkCAwDYb6L+W4VTC/1auGVbblnNYwBxbk+tZbAiBw="; + sha256 = "5dcd2c5cbf2f419da00abde00798d067b515c2f082ce63f4fbe1de47682c1c41"; }; nativeBuildInputs = [ From f99f734f2b081344cff7bd6beed0e45b051854c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 13 Oct 2021 12:40:42 -0300 Subject: [PATCH 29/36] hexchat: 2.14.3 -> 2.16.0 --- .../networking/irc/hexchat/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index 2a91e3ebddcd..504481479ed2 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,25 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, gtk2, lua, perl, python3 +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, gtk2, lua, perl, python3Packages , pciutils, dbus-glib, libcanberra-gtk2, libproxy , enchant2, libnotify, openssl, isocodes , desktop-file-utils -, meson, ninja +, meson, ninja, makeWrapper }: stdenv.mkDerivation rec { pname = "hexchat"; - version = "2.14.3"; + version = "2.16.0"; src = fetchFromGitHub { owner = "hexchat"; repo = "hexchat"; rev = "v${version}"; - sha256 = "08kvp0dcn3bvmlqcfp9312075bwkqkpa8m7zybr88pfp210gfl85"; + sha256 = "08zhlf9d3xdis62byxzgizhfg8kbppxl7cgxkzhwdc1srpj7vpx6"; }; - nativeBuildInputs = [ meson ninja pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config makeWrapper ]; buildInputs = [ - gtk2 lua perl python3 pciutils dbus-glib libcanberra-gtk2 libproxy + gtk2 lua perl python3Packages.python python3Packages.cffi pciutils dbus-glib libcanberra-gtk2 libproxy libnotify openssl desktop-file-utils isocodes ]; @@ -30,9 +30,10 @@ stdenv.mkDerivation rec { sed -i "/flag.startswith('-I')/i if flag.contains('no-such-path')\ncontinue\nendif" plugins/perl/meson.build chmod +x meson_post_install.py for f in meson_post_install.py \ - src/common/make-te.py \ plugins/perl/generate_header.py \ - po/validate-textevent-translations + plugins/python/generate_plugin.py \ + po/validate-textevent-translations \ + src/common/make-te.py do patchShebangs $f done @@ -40,6 +41,10 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dwith-lua=lua" "-Dwith-text=true" ]; + postInstall = '' + wrapProgram $out/bin/hexchat --prefix PYTHONPATH : "$PYTHONPATH" + ''; + meta = with lib; { description = "A popular and easy to use graphical IRC (chat) client"; homepage = "https://hexchat.github.io/"; From c9b7cc79e6ce6b38debb28ab0d06051a4fb5b336 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 25 Aug 2021 18:35:16 +0200 Subject: [PATCH 30/36] lib.warn: Add NIX_ABORT_ON_WARN for call traces --- lib/trivial.nix | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/lib/trivial.nix b/lib/trivial.nix index 7956ba4bde6f..a389c7cdfacb 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -303,7 +303,26 @@ rec { # TODO: figure out a clever way to integrate location information from # something like __unsafeGetAttrPos. - warn = msg: builtins.trace "warning: ${msg}"; + /* + Print a warning before returning the second argument. This function behaves + like `builtins.trace`, but requires a string message and formats it as a + warning, including the `warning: ` prefix. + + To get a call stack trace and abort evaluation, set the environment variable + `NIX_ABORT_ON_WARN=true` and set the Nix options `--option pure-eval false --show-trace` + + Type: string -> a -> a + */ + warn = + if lib.elem (builtins.getEnv "NIX_ABORT_ON_WARN") ["1" "true" "yes"] + then msg: builtins.trace "warning: ${msg}" (abort "NIX_ABORT_ON_WARN=true; warnings are treated as unrecoverable errors.") + else msg: builtins.trace "warning: ${msg}"; + + /* + Like warn, but only warn when the first argument is `true`. + + Type: bool -> string -> a -> a + */ warnIf = cond: msg: if cond then warn msg else id; info = msg: builtins.trace "INFO: ${msg}"; From 4245631ef84d2670a71beea7d7af02abb66d7000 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 13 Oct 2021 20:48:29 +0000 Subject: [PATCH 31/36] python38Packages.teslajsonpy: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/teslajsonpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index f6b2f180733b..b7b863101b23 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "zabuldon"; repo = pname; rev = "v${version}"; - sha256 = "1xkr0pmz458vh8b90ydykmgddhisay347vp48j50d1v0a55xvqsa"; + sha256 = "0pb0kgddyzpipa0sqrkwyg1jgh95726irb306lr0pyyg0rsk54k7"; }; nativeBuildInputs = [ From 1a8fc0bb5245d190dad9823d6c19badc1b3bbfa1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Oct 2021 22:53:14 +0200 Subject: [PATCH 32/36] gst_all_1.gst-plugins-bad: disable asserts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `lib/gstreamer-1.0/libgstdvbsubenc.so` and `lib/libgstcodecparsers-1.0.so` include `${gstreamer.dev}/include/gstreamer-1.0/gst/base/gstbitwriter.h` in their .rodata section, increasing the runtime closure unnecessarily. This happens because `gstbitwriter.h` header uses GLib’s `g_assert` macro, which wants to print `__FILE__` on assertion failure. The assertions can and should be disabled on stable releases (https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/7b8d74c15bb817c65c06c63580dae3633a914841) so let’s do that. --- pkgs/development/libraries/gstreamer/bad/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index aa89d947a012..de6ccd153780 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -233,6 +233,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing + "-Dglib-asserts=disabled" # asserts should be disabled on stable releases "-Davtp=disabled" "-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development" From 800ceaf1bdba85525015c967eb9921977a35090a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 Oct 2021 23:01:47 +0200 Subject: [PATCH 33/36] gst_all_1.gst-plugins-good: disable asserts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `lib/gstreamer-1.0/libgstrtpmanager.so` includes `${gstreamer.dev}/include/gstreamer-1.0/gst/base/gstbitwriter.h` in their .rodata section, increasing the runtime closure unnecessarily. This happens because `gstbitwriter.h` header uses GLib’s `g_assert` macro, which wants to print `__FILE__` on assertion failure. The assertions can and should be disabled on stable releases (https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/ce64f0e0e0d4e692c8d99f9744d38b9676b3d720) so let’s do that. --- pkgs/development/libraries/gstreamer/good/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 86684893efd3..bc1656c191a4 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -120,6 +120,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing + "-Dglib-asserts=disabled" # asserts should be disabled on stable releases ] ++ lib.optionals (!qt5Support) [ "-Dqt5=disabled" ] ++ lib.optionals (!gtkSupport) [ From ce7c0c25dd1519e0fec1ff1a17e34759e0d02eea Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 14 Oct 2021 00:38:41 +0300 Subject: [PATCH 34/36] linuxPackages.tbs: mark broken --- pkgs/os-specific/linux/tbs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix index f2a7b692baa3..54268693454c 100644 --- a/pkgs/os-specific/linux/tbs/default.nix +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -59,6 +59,6 @@ in stdenv.mkDerivation { license = licenses.gpl2; maintainers = with maintainers; [ ck3d ]; priority = -1; - broken = lib.versionAtLeast kernel.version "4.18"; + broken = true; }; } From 6fbc97704c01da5aa999983acdec7639fd9d7f9b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 14 Oct 2021 00:27:54 +0200 Subject: [PATCH 35/36] onboard: fix indicator support Closes: https://github.com/NixOS/nixpkgs/issues/117942 --- pkgs/applications/misc/onboard/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index 745d03bb189e..198757514436 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -15,6 +15,7 @@ , hunspellWithDicts , intltool , isocodes +, libappindicator-gtk3 , libcanberra-gtk3 , mousetweaks , udev @@ -70,6 +71,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 hunspell isocodes + libappindicator-gtk3 libcanberra-gtk3 libxkbcommon mousetweaks From e90c3e2fe5039095f1c1f62587f131fc25ef8485 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 14 Oct 2021 00:29:00 +0200 Subject: [PATCH 36/36] onboard: move python dependencies to pythonPath It is deprecated but otherwise wrapPython adds everything that is propagated, including dev outputs, to program_PATH, which ends up in the wrapper. --- pkgs/applications/misc/onboard/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index 198757514436..fba1c0b0f5f8 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -80,7 +80,7 @@ python3.pkgs.buildPythonApplication rec { xorg.libxkbfile ] ++ lib.optional atspiSupport at-spi2-core; - propagatedBuildInputs = with python3.pkgs; [ + pythonPath = with python3.pkgs; [ dbus-python distutils_extra pyatspi