From e93889e81c9d42be6cbf6e3d2213f888f16a6dec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Sep 2021 09:54:23 +0200 Subject: [PATCH 01/90] python3Packages.huawei-lte-api: 1.4.18 -> 1.5.2 --- .../python-modules/huawei-lte-api/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/huawei-lte-api/default.nix b/pkgs/development/python-modules/huawei-lte-api/default.nix index 44cbfd4f0e0a..2b0fb912387a 100644 --- a/pkgs/development/python-modules/huawei-lte-api/default.nix +++ b/pkgs/development/python-modules/huawei-lte-api/default.nix @@ -2,15 +2,15 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, dicttoxml +, pycryptodomex +, pytestCheckHook , requests , xmltodict -, pytestCheckHook }: buildPythonPackage rec { pname = "huawei-lte-api"; - version = "1.4.18"; + version = "1.5.2"; disabled = pythonOlder "3.4"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Salamek"; repo = "huawei-lte-api"; rev = version; - sha256 = "1qaqxmh03j10wa9wqbwgc5r3ays8wfr7bldvsm45fycr3qfyn5fg"; + sha256 = "sha256-xG0QTvjYW0/C/7NNhl/d024TSAe0TzgMknOXvNxrPOY="; }; postPatch = '' @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - dicttoxml + pycryptodomex requests xmltodict ]; From 78709d2d03af827d2fc2f6488f8bee9c1b7a45a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 27 Sep 2021 01:34:11 +0000 Subject: [PATCH 02/90] python38Packages.azure-mgmt-authorization: 1.0.0 -> 2.0.0 --- .../python-modules/azure-mgmt-authorization/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix index a622c6a94c90..0489cb112b8e 100644 --- a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-authorization"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "9a9fc16866b46387853381ab4fa0f84c1765e0afea5b0124709ea9fae10ee752"; + sha256 = "0776edc4980be940a8602eefc0372b4d1a1fa26caa46e3c0234e0c7a0feda4ec"; }; propagatedBuildInputs = [ From 4bd6390df1c820826f217645f40ea30d3bb2bce0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 Oct 2021 15:57:10 +0000 Subject: [PATCH 03/90] python38Packages.tweepy: 3.10.0 -> 4.0.1 --- pkgs/development/python-modules/tweepy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index dd11e60aff6c..ee5c8582948d 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "tweepy"; - version = "3.10.0"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "76e6954b806ca470dda877f57db8792fff06a0beba0ed43efc3805771e39f06a"; + sha256 = "3bbb14a0ddef1ca8c9e8686ab2f647163afa02a6bab83507335ce647e9653a90"; }; doCheck = false; From 30453bbf3095739c2d3d110cd06893d41ee03ad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Mon, 4 Oct 2021 16:13:37 -0300 Subject: [PATCH 04/90] python3Packages.MDP: reenable tests Tests were disabled years ago by 140136ad956 (mdp: disable tests, 2017-09-14) because of missing dependencies that are not in nixpkgs, but current version 3.6 prints a warning and run the tests just fine. ============================= test session starts ============================== platform darwin -- Python 3.9.6, pytest-6.2.5, py-1.10.0, pluggy-1.0.0 python: 3.9.6.final.0 mdp: 3.6 parallel python: NOT AVAILABLE: No module named 'pp' shogun: NOT AVAILABLE: No module named 'shogun' libsvm: NOT AVAILABLE: No module named 'libsvm' joblib: NOT AVAILABLE: No module named 'joblib' sklearn: NOT AVAILABLE: No module named 'scikits' numx: numpy 1.21.2 symeig: symeig_fake Random Seed: 7710873 --- .../python-modules/mdp/default.nix | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix index 55a440e68089..dc73daa449b9 100644 --- a/pkgs/development/python-modules/mdp/default.nix +++ b/pkgs/development/python-modules/mdp/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, future, numpy }: +{ lib +, buildPythonPackage +, fetchPypi +, future +, numpy +, pytest +}: buildPythonPackage rec { pname = "MDP"; @@ -9,11 +15,27 @@ buildPythonPackage rec { sha256 = "ac52a652ccbaed1857ff1209862f03bf9b06d093b12606fb410787da3aa65a0e"; }; - checkInputs = [ pytest ]; propagatedBuildInputs = [ future numpy ]; - # Tests disabled because of missing dependencies not in nix - doCheck = false; + checkInputs = [ pytest ]; + + doCheck = true; + + pythonImportsCheck = [ "mdp" "bimdp" ]; + + postPatch = '' + # https://github.com/mdp-toolkit/mdp-toolkit/issues/92 + substituteInPlace mdp/utils/routines.py --replace numx.typeDict numx.sctypeDict + ''; + + checkPhase = '' + runHook preCheck + + pytest --seed 7710873 mdp + pytest --seed 7710873 bimdp + + runHook postCheck + ''; meta = with lib; { description = "Library for building complex data processing software by combining widely used machine learning algorithms"; From a3e5b793b52b27807b06d92993e09add8cc92388 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 15 Oct 2021 02:39:10 +0000 Subject: [PATCH 05/90] python38Packages.azure-mgmt-containerinstance: 9.0.0 -> 9.1.0 --- .../python-modules/azure-mgmt-containerinstance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix index 45158b8015d5..ae6d9755171e 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerinstance"; - version = "9.0.0"; + version = "9.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "041431c5a768ac652aac318a17f2a53b90db968494c79abbafec441d0be387ff"; + sha256 = "22164b0c59138b37bc48ba6d476bf635152bc428dcb420b521a14b8c25c797ad"; }; propagatedBuildInputs = [ From a5a4b0c3163ed3c89309b53860375e149e02c23b Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Thu, 14 Oct 2021 20:55:10 -0700 Subject: [PATCH 06/90] nss-mdns: patch unconditionally the musl patch guards its functionality appropriately, so we can apply it unconditionally --- pkgs/tools/networking/nss-mdns/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index 6faf1f06dbb8..6ba996401a84 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -21,14 +21,13 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; - patches = lib.optional stdenv.hostPlatform.isMusl - ( - fetchpatch - { - url = "https://raw.githubusercontent.com/openembedded/openembedded-core/94f780e889f194b67a48587ac68b3200288bee10/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch"; - sha256 = "1l1kjbdw8z31br4vib3l5b85jy7kxin760a2f24lww8v6lqdpgds"; - } - ); + patches = [ + # Provide compat definition for libc lacking (e.g. musl) + (fetchpatch { + url = "https://raw.githubusercontent.com/openembedded/openembedded-core/94f780e889f194b67a48587ac68b3200288bee10/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch"; + sha256 = "1l1kjbdw8z31br4vib3l5b85jy7kxin760a2f24lww8v6lqdpgds"; + }) + ]; meta = { From 92ed47487f148061fab7396eb39b80df6eee5400 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Thu, 14 Oct 2021 21:24:04 -0700 Subject: [PATCH 07/90] qemu: drop obsolete musl patch not needed as of https://github.com/qemu/qemu/commit/b1d2e476e94cb215d9e19fef1049d413b414ffc2, in qemu v6.0+ --- pkgs/applications/virtualization/qemu/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 224969cc2649..c3243bdc8c66 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -94,10 +94,6 @@ stdenv.mkDerivation rec { }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch ++ lib.optionals stdenv.hostPlatform.isMusl [ - (fetchpatch { - url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch"; - sha256 = "1gm67v41gw6apzgz7jr3zv9z80wvkv0jaxd2w4d16hmipa8bhs0k"; - }) ./sigrtminmax.patch (fetchpatch { url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch"; From fa87afd754177b8ad376cf40ab3adc7e2f1a8d67 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 16 Oct 2021 23:54:29 +0000 Subject: [PATCH 08/90] python38Packages.icalendar: 4.0.8 -> 4.0.9 --- pkgs/development/python-modules/icalendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 289099dbb0e9..1e7200cffe46 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "4.0.8"; + version = "4.0.9"; pname = "icalendar"; src = fetchPypi { inherit pname version; - sha256 = "7508a92b4e36049777640b0ae393e7219a16488d852841a0e57b44fe51d9f848"; + sha256 = "cc73fa9c848744843046228cb66ea86cd8c18d73a51b140f7c003f760b84a997"; }; buildInputs = [ setuptools ]; From afa297466f35c90bb3a1c5f2ebd38537d2de5301 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 Oct 2021 07:33:11 +0000 Subject: [PATCH 09/90] python38Packages.sagemaker: 2.63.0 -> 2.63.1 --- pkgs/development/python-modules/sagemaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 015ba22781a8..ece8af476d87 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.63.0"; + version = "2.63.1"; src = fetchPypi { inherit pname version; - sha256 = "b4d793217181f4ff1d269aa22e44f82e21a060ec9723301e1ae5e7d9082c76c8"; + sha256 = "924847e9793b76d188049718aabbcad975296bb267812ad18e0279e7af0cb748"; }; pythonImportsCheck = [ From 8549dfea8d57ebf5a9fe4a6ba456f19fbdc26eb8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 Oct 2021 23:33:19 +0000 Subject: [PATCH 10/90] python38Packages.easy-thumbnails: 2.7.1 -> 2.7.2 --- pkgs/development/python-modules/easy-thumbnails/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index f2be7b1903da..53913f77d2b5 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "easy-thumbnails"; - version = "2.7.1"; + version = "2.7.2"; meta = { description = "Easy thumbnails for Django"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f862949208d9066cd3d84ffcf9c2dbe9c7344ea6152b741e440f861eca46855c"; + sha256 = "a7dd9cf97efaf70ba5d76484a962f08ba65b31f1681bc417257743650e9e8a8a"; }; propagatedBuildInputs = [ django pillow ]; From 22f532258cc2fc0faa030bbbe7c3139f1ab4ac64 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 18 Oct 2021 06:20:09 +0000 Subject: [PATCH 11/90] python38Packages.pyopencl: 2021.2.8 -> 2021.2.9 --- pkgs/development/python-modules/pyopencl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index c19e571a9cc8..c5c7c6b2fb74 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -21,7 +21,7 @@ let if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2021.2.8"; + version = "2021.2.9"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs; @@ -30,7 +30,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "15809b5d2b9a86ad01e31d176c00415436805ac884c4d197d9263bfe98280d76"; + sha256 = "51425e65ec49c738eefe21b1eeb1f39245b01cc0ddfd495fbe1f8df33dbc6c9e"; }; # py.test is not needed during runtime, so remove it from `install_requires` From 29e06158ef44ac16296a71721d7cc080f67a690d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Oct 2021 01:41:44 +0000 Subject: [PATCH 12/90] python38Packages.authheaders: 0.13.0 -> 0.14.1 --- pkgs/development/python-modules/authheaders/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix index a1d049ebb151..8593f7f4d742 100644 --- a/pkgs/development/python-modules/authheaders/default.nix +++ b/pkgs/development/python-modules/authheaders/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "authheaders"; - version = "0.13.0"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "935726b784cc636cbcfed2c977f1a6887dc60056806da4eff60db932c5896692"; + sha256 = "4e601b5b54080019a2f548fadf80ddf9c5538615607c7fb602936404aafe67e2"; }; propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix2 ] From e750ba7e6b49517b775ea1427a3316523c97ac21 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 19 Oct 2021 15:26:19 +0000 Subject: [PATCH 13/90] python38Packages.azure-mgmt-recoveryservicesbackup: 2.0.0 -> 3.0.0 --- .../azure-mgmt-recoveryservicesbackup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 3ebc199599bd..67343337868a 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "2.0.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d3e60daefbc20a7fa381c7ad1498f4bf4bb5a1414c1c64188cc9d5c98c4e12ac"; + sha256 = "1992486b28ddd6d4f597fd3004217cd2caf4f4dc8a0ce71226b5ae767ace3a18"; }; propagatedBuildInputs = [ From 0da88ff0a0289dbfe32929a704588152a11faee9 Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 20 Oct 2021 00:31:13 +0200 Subject: [PATCH 14/90] yquake2: 7.43 -> 8.00 --- pkgs/games/quake2/yquake2/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index 57405d9abd38..d251c48d3823 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/pkgs/games/quake2/yquake2/default.nix @@ -15,15 +15,20 @@ let yquake2 = stdenv.mkDerivation rec { pname = "yquake2"; - version = "7.43"; + version = "8.00"; src = fetchFromGitHub { owner = "yquake2"; repo = "yquake2"; rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "1dszbvxlh1npq4nv9s4wv4lcyfgb01k92ncxrrczsxy1dddg86pp"; + sha256 = "0xnpmh0pl1095dykhc76rp242x587yh9zh6wayqzaam6cn3xlz3w"; }; + postPatch = '' + substituteInPlace src/common/filesystem.c \ + --replace /usr/share/games/quake2 $out/share/games/quake2 + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 libGL curl ] From ae3ce3861c008cf8fe4c65a9b0037fdc2bd9e12e Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 25 Oct 2021 19:54:40 +0200 Subject: [PATCH 15/90] vista-fonts: install cambria.ttc as well --- pkgs/data/fonts/vista-fonts/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index ca2ae302b3ee..fa8308b8c972 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -14,11 +14,12 @@ stdenvNoCC.mkDerivation { unpackPhase = '' cabextract --lowercase --filter ppviewer.cab $src cabextract --lowercase --filter '*.TTF' ppviewer.cab + cabextract --lowercase --filter '*.TTC' ppviewer.cab ''; installPhase = '' mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype + cp *.ttf *.ttc $out/share/fonts/truetype # Set up no-op font configs to override any aliases set up by # other packages. From e83647df364f78a1612cab19db4f57fde8afd418 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Oct 2021 09:08:53 +0000 Subject: [PATCH 16/90] python38Packages.azure-mgmt-network: 19.1.0 -> 19.2.0 --- .../development/python-modules/azure-mgmt-network/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 20d3db5669a3..4d5426a4b190 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -10,14 +10,14 @@ }: buildPythonPackage rec { - version = "19.1.0"; + version = "19.2.0"; pname = "azure-mgmt-network"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "62ef7fe8ba98e56412b434c9c35dc755b3c5e469f2c01bbed2ce0d12973a044b"; + sha256 = "c8da1cf9523b89d4b268546ea087153372633962e31a4e6befae20d0ae308bac"; }; propagatedBuildInputs = [ From d0992629edf15f1a756130104f4eaa2b216a8dce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Oct 2021 10:18:33 +0000 Subject: [PATCH 17/90] python38Packages.nbdime: 3.1.0 -> 3.1.1 --- pkgs/development/python-modules/nbdime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 0d073027e5d5..fa72ab748d75 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "nbdime"; - version = "3.1.0"; + version = "3.1.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "12dc4390b355b26d07ac8d11d50efbcb54bae0ad5842b817131babd2f4567963"; + sha256 = "67767320e971374f701a175aa59abd3a554723039d39fae908e72d16330d648b"; }; checkInputs = [ From aa92ca3c857e43e7e73db87226bbc945dd13f890 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Oct 2021 10:24:34 +0000 Subject: [PATCH 18/90] python38Packages.django_environ: 0.7.0 -> 0.8.1 --- pkgs/development/python-modules/django_environ/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_environ/default.nix b/pkgs/development/python-modules/django_environ/default.nix index 7c36db1d1187..633d3e7286eb 100644 --- a/pkgs/development/python-modules/django_environ/default.nix +++ b/pkgs/development/python-modules/django_environ/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-environ"; - version = "0.7.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "b99bd3704221f8b717c8517d8146e53fdee509d9e99056be560060003b92213e"; + sha256 = "6f0bc902b43891656b20486938cba0861dc62892784a44919170719572a534cb"; }; # The testsuite fails to modify the base environment From d3751a11dbebc5028c0a6114ee6e91abfa723ec9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Oct 2021 21:17:57 +0000 Subject: [PATCH 19/90] python38Packages.exchangelib: 4.5.2 -> 4.6.0 --- pkgs/development/python-modules/exchangelib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 686a167d74bf..dba1af3d0a4f 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "4.5.2"; + version = "4.6.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ecederstrand"; repo = pname; rev = "v${version}"; - sha256 = "1zz4p13ww9y5x0ifvcj652hgfbjqbnmr3snwrs0p315sc3y47ggm"; + sha256 = "1lx5q3m3vhbx9xnm3v25xrrxvli1nh0lsza51ln4y3fk79ln91hv"; }; propagatedBuildInputs = [ From 5e2ebc73dfb06fdb6e00db99e88f3c99efa9f33b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Oct 2021 23:45:04 +0000 Subject: [PATCH 20/90] python38Packages.pytest-flakes: 4.0.3 -> 4.0.4 --- pkgs/development/python-modules/pytest-flakes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index e016b68837de..ef06ed1bf4f0 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { # upstream has abandoned project in favor of pytest-flake8 # retaining package to not break other packages pname = "pytest-flakes"; - version = "4.0.3"; + version = "4.0.4"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "bf070c5485dad82d5b5f5d0eb08d269737e378492d9a68f5223b0a90924c7754"; + sha256 = "551467a129331bed83596f3145d9eaf6541c26a03dc1b36419efef8ae231341b"; }; buildInputs = [ pytest ]; From 0b949588a66ec9f978e5167175bb45ab3e459323 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 00:53:37 +0000 Subject: [PATCH 21/90] python38Packages.zarr: 2.10.1 -> 2.10.2 --- pkgs/development/python-modules/zarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 0a8f13705eb5..9e5b05821295 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.10.1"; + version = "2.10.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "29e90114f037d433752b3cf951e4a3cb6c6f67b6501a273439b4be4a824e4caf"; + sha256 = "5c6ae914ab9215631bb95c09e76b9b9b4fffa70fec0c7bca26b68387d858ebe2"; }; nativeBuildInputs = [ From 61312e68a35d1525fe316313f76d766a7477b77d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 01:42:54 +0000 Subject: [PATCH 22/90] python38Packages.jaeger-client: 4.6.1 -> 4.8.0 --- pkgs/development/python-modules/jaeger-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaeger-client/default.nix b/pkgs/development/python-modules/jaeger-client/default.nix index 05a76333af09..2c636d32b30f 100644 --- a/pkgs/development/python-modules/jaeger-client/default.nix +++ b/pkgs/development/python-modules/jaeger-client/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jaeger-client"; - version = "4.6.1"; + version = "4.8.0"; src = fetchPypi { inherit pname version; - sha256 = "3bc27ad77e035efd0899f377a15f180467fec44b2afbf5be0660cc888a2a4ac3"; + sha256 = "3157836edab8e2c209bd2d6ae61113db36f7ee399e66b1dcbb715d87ab49bfe0"; }; propagatedBuildInputs = [ From 639941bcfc0c51d7a1e468a66de7156f32fc145b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Oct 2021 02:26:47 +0000 Subject: [PATCH 23/90] python38Packages.jellyfish: 0.8.8 -> 0.8.9 --- pkgs/development/python-modules/jellyfish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index 436aad07bf8c..546e56f702f6 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jellyfish"; - version = "0.8.8"; + version = "0.8.9"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0506089cacf9b5897442134417b04b3c6610c19f280ae535eace390dc6325a5c"; + sha256 = "90d25e8f5971ebbcf56f216ff5bb65d6466572b78908c88c47ab588d4ea436c2"; }; checkInputs = [ pytest unicodecsv ]; From 1ff9d8770574d6b6ce4d85136df9c5e08216c93a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Oct 2021 07:04:50 +0000 Subject: [PATCH 24/90] python39Packages.vispy: 0.9.1 -> 0.9.3 --- pkgs/development/python-modules/vispy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index 666fcd8dbb8d..c13f7b6d7d3a 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "vispy"; - version = "0.9.1"; + version = "0.9.3"; src = fetchPypi { inherit pname version; - sha256 = "75e2923792b937fbb0eb817716430613b6a2b37331cffb13bf623913a76b1da1"; + sha256 = "bc3aec042637947d4e999121bab224077a6f7ede4af745102f41737f7c81c05a"; }; patches = [ From 8b81b49ecde61c1595b2a013ef55d7e4c23f3167 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Oct 2021 19:58:26 +0000 Subject: [PATCH 25/90] faustPhysicalModeling: 2.33.1 -> 2.37.3 --- pkgs/applications/audio/faustPhysicalModeling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix index 8dd43ead5914..f9dbd3f80f0c 100644 --- a/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.33.1"; + version = "2.37.3"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-gzkfLfNhJHg/jEhf/RQDhHnXxn3UI15eDZfutKt3yGk="; + sha256 = "sha256-h6L+qRkN2chnI4821WrjD3uRFw3J0sUYVLL8w57vR1U="; }; buildInputs = [ faust2jaqt faust2lv2 ]; From f5cfdee7084e69244e85403aa670269117b5af43 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 31 Oct 2021 19:21:44 +0100 Subject: [PATCH 26/90] linux_lqx: 5.14.14 -> 5.14.15 --- pkgs/os-specific/linux/kernel/linux-lqx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index 8c8b764a8812..9b838d4a4f88 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.14.14"; + version = "5.14.15"; suffix = "lqx1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-gwWZNGHmbKQajMP4mu3XT2Xf93MkcNpAXW8h94O4pNM="; + sha256 = "sha256-oyGnJghCbFHTr5JNolgYg+QnQxpqZKZ4OjU4wIytO38="; }; extraMeta = { From 5d7683fcae9f3958bf5e200aeb5b0d0fb6c452dd Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 2 Nov 2021 10:35:55 -0400 Subject: [PATCH 27/90] nixos/zabbixWeb: remove added whitespace to the passwordFile option --- nixos/modules/services/web-apps/zabbix.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/zabbix.nix b/nixos/modules/services/web-apps/zabbix.nix index 21567896a89e..ff50b95254f9 100644 --- a/nixos/modules/services/web-apps/zabbix.nix +++ b/nixos/modules/services/web-apps/zabbix.nix @@ -21,7 +21,8 @@ let $DB['PORT'] = '${toString cfg.database.port}'; $DB['DATABASE'] = '${cfg.database.name}'; $DB['USER'] = '${cfg.database.user}'; - $DB['PASSWORD'] = ${if cfg.database.passwordFile != null then "file_get_contents('${cfg.database.passwordFile}')" else "''"}; + # NOTE: file_get_contents adds newline at the end of returned string + $DB['PASSWORD'] = ${if cfg.database.passwordFile != null then "trim(file_get_contents('${cfg.database.passwordFile}'), \"\\r\\n\")" else "''"}; // Schema name. Used for IBM DB2 and PostgreSQL. $DB['SCHEMA'] = '''; $ZBX_SERVER = '${cfg.server.address}'; From d382dd518fc4456d317672fa245cc5231f7dc1f5 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Tue, 2 Nov 2021 21:28:55 -0600 Subject: [PATCH 28/90] binance: set electron version on top-level --- pkgs/applications/misc/binance/default.nix | 9 +++------ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/binance/default.nix b/pkgs/applications/misc/binance/default.nix index 1a14055ae09b..c86342f6e787 100644 --- a/pkgs/applications/misc/binance/default.nix +++ b/pkgs/applications/misc/binance/default.nix @@ -1,10 +1,7 @@ -{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron_12, -alsa-lib, gtk3, libxshmfence, mesa, nss, popt }: +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron +, alsa-lib, gtk3, libxshmfence, mesa, nss, popt }: -let - electron = electron_12; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "binance"; version = "1.26.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f848cfac2582..1d05a08d1a70 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1461,7 +1461,9 @@ with pkgs; bic = callPackage ../development/interpreters/bic { }; - binance = callPackage ../applications/misc/binance { }; + binance = callPackage ../applications/misc/binance { + electron = electron_12; + }; bit = callPackage ../applications/version-management/git-and-tools/bit { }; From 7eaf05af307861a348bdada0645c425fac595d15 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 3 Nov 2021 08:17:39 +0000 Subject: [PATCH 29/90] most: enable parallel building --- pkgs/tools/misc/most/default.nix | 7 +++++++ pkgs/tools/misc/most/parallel-make.patch | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/misc/most/parallel-make.patch diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix index de2118083d98..2073e066ae73 100644 --- a/pkgs/tools/misc/most/default.nix +++ b/pkgs/tools/misc/most/default.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "008537ns659pw2aag15imwjrxj73j26aqq90h285is6kz8gmv06v"; }; + patches = [ + # Upstream patch to fix parallel build failure + ./parallel-make.patch + ]; + outputs = [ "out" "doc" ]; makeFlags = [ @@ -26,6 +31,8 @@ stdenv.mkDerivation rec { buildInputs = [ slang ncurses ]; + enableParallelBuilding = true; + meta = with lib; { description = "A terminal pager similar to 'more' and 'less'"; longDescription = '' diff --git a/pkgs/tools/misc/most/parallel-make.patch b/pkgs/tools/misc/most/parallel-make.patch new file mode 100644 index 000000000000..07c2e47c673e --- /dev/null +++ b/pkgs/tools/misc/most/parallel-make.patch @@ -0,0 +1,18 @@ +Upstream commit c9cfad50a ("src/Makefile.in: Avoid a race condition +when performing a parallel build") + +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -54,6 +54,12 @@ COMPILE_CMD = $(CC) -c $(ALL_CFLAGS) -DMOST_SYSTEM_INITFILE='"$(SYS_INITFILE)"' + all: $(EXEC) + $(EXEC): $(OBJDIR) $(CONFIG_H) slangversion $(OBJDIR)/$(EXEC) + @echo $(EXEC) created in $(OBJDIR) ++ ++# C source files include autogenrated "config.h". Make sure ++# it's available before the compilation. Pessimistically assume ++# any source file can depend on "config.h". ++$(OBJS) $(OBJDIR)/chkslang.o: $(CONFIG_H) ++ + $(OBJDIR)/$(EXEC): $(OBJS) + cd $(OBJDIR); $(CC) $(OFILES) -o $(EXEC) $(LDFLAGS) $(EXECLIBS) + # From d86143af529b03cf432e7ef9cc6e2e2e761e97a0 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Wed, 3 Nov 2021 14:23:32 +0100 Subject: [PATCH 30/90] fortran-language-server: init at 1.12.0 fortran-language-server: add pythonImportsCheck and a `--help`cli interaction fortran-language-server: do not discard errors --- .../tools/fortran-language-server/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/tools/fortran-language-server/default.nix diff --git a/pkgs/development/tools/fortran-language-server/default.nix b/pkgs/development/tools/fortran-language-server/default.nix new file mode 100644 index 000000000000..2c606ab715b5 --- /dev/null +++ b/pkgs/development/tools/fortran-language-server/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchPypi, buildPythonApplication }: + +buildPythonApplication rec { + pname = "fortran-language-server"; + version = "1.12.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "7Dkh7yPX4rULkzfJFxg47YxrCaxuHk+k3TOINHS9T5A="; + }; + + checkPhase = "$out/bin/fortls --help 1>/dev/null"; + pythonImportsCheck = [ "fortls" ]; + + meta = with lib; { + description = "FORTRAN Language Server for the Language Server Protocol"; + homepage = "https://pypi.org/project/fortran-language-server/"; + license = [ licenses.mit ]; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7caf86fe49f..22ca08896ae5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14439,6 +14439,8 @@ with pkgs; fprettify = callPackage ../development/tools/fprettify { }; + fortran-language-server = python3.pkgs.callPackage ../development/tools/fortran-language-server { }; + framac = callPackage ../development/tools/analysis/frama-c { }; frame = callPackage ../development/libraries/frame { }; From df5fd5580c8df80f59eee5a39f0402767dac491f Mon Sep 17 00:00:00 2001 From: Atemu Date: Thu, 4 Nov 2021 09:57:14 +0100 Subject: [PATCH 31/90] linux_lqx: 5.14.15 -> 5.14.16 --- pkgs/os-specific/linux/kernel/linux-lqx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index 9b838d4a4f88..98a340cf9480 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.14.15"; + version = "5.14.16"; suffix = "lqx1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-oyGnJghCbFHTr5JNolgYg+QnQxpqZKZ4OjU4wIytO38="; + sha256 = "sha256-nWeHvKnVo/ln8sTLdFTK1pG09HMTdZ75a+3Ehxjd5pc="; }; extraMeta = { From 7c6d4c902a049d70e4b7638d190cce20be2d1aeb Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 4 Nov 2021 15:27:22 +0100 Subject: [PATCH 32/90] staticjinja: 4.1.0 -> 4.1.1 --- nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 2 +- nixos/doc/manual/release-notes/rl-2111.section.md | 2 +- pkgs/development/python-modules/staticjinja/default.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 39b17835482c..d3d7121d4ece 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -535,7 +535,7 @@ Superuser created successfully. The staticjinja package has been upgraded - from 1.0.4 to 4.1.0 + from 1.0.4 to 4.1.1 diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 51811f580121..640a7d36a6cd 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -185,7 +185,7 @@ In addition to numerous new and upgraded packages, this release has the followin Superuser created successfully. ``` -- The `staticjinja` package has been upgraded from 1.0.4 to 4.1.0 +- The `staticjinja` package has been upgraded from 1.0.4 to 4.1.1 - Firefox v91 does not support addons with invalid signature anymore. Firefox ESR needs to be used for nix addon support. diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index bce5316187e7..d0c4d39f1165 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "staticjinja"; - version = "4.1.0"; + version = "4.1.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "sha256-4IL+7ncJPd1e7k5oFRjQ6yvDjozcBAAZPf88biNTiLU="; + sha256 = "sha256-Bpgff3VaTylnYpkWoaWEiRWu4sYSP6dLbHDOjAhj7BM="; }; nativeBuildInputs = [ From d4f4b721bcdb394749f072a2679ac06d580bc003 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 2 Nov 2021 18:06:09 -0700 Subject: [PATCH 33/90] openafs: Add upstream patches for Linux kernel 5.15 Signed-off-by: Anders Kaseorg --- pkgs/servers/openafs/1.8/module.nix | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 9b113a4a0d1e..2543aef37690 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, which, autoconf, automake, flex, bison -, kernel, glibc, perl, libtool_2, libkrb5 }: +, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }: with (import ./srcs.nix { inherit fetchurl; @@ -18,6 +18,23 @@ in stdenv.mkDerivation { buildInputs = [ libkrb5 ]; + patches = [ + # LINUX 5.14: explicitly set set_page_dirty to default + ((fetchpatch { + url = "https://gerrit.openafs.org/changes/14830/revisions/20b8a37950b3718b85a4a3d21b23469a5176eb6a/patch"; + sha256 = "1mkfwq0pbwvfjspsy2lxhi0f09hljgc6xyn3y97sai0dyivn05jp"; + }).overrideAttrs (o: { + postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch; + })) + # Linux 5.15: Convert osi_Msg macro to a function + ((fetchpatch { + url = "https://gerrit.openafs.org/changes/14831/revisions/6cfa9046229d90c0625687e3fddb7877f21fbcff/patch"; + sha256 = "18rip9a1krxf47fizf3f12ddq55apzb2w3wjj5qs7n3sh2nwks7g"; + }).overrideAttrs (o: { + postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch; + })) + ]; + hardeningDisable = [ "pic" ]; configureFlags = [ @@ -56,6 +73,6 @@ in stdenv.mkDerivation { license = licenses.ipl10; platforms = platforms.linux; maintainers = with maintainers; [ maggesi spacefrogg ]; - broken = versionOlder kernel.version "3.18" || kernel.kernelAtLeast "5.15" || kernel.isHardened; + broken = versionOlder kernel.version "3.18" || kernel.isHardened; }; } From 5a4df47ec78fee539941d4f56cf2897c7d3c9189 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 7 Nov 2021 22:27:27 +0100 Subject: [PATCH 34/90] aether-lv2: init at 1.2.1 --- .../applications/audio/aether-lv2/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/audio/aether-lv2/default.nix diff --git a/pkgs/applications/audio/aether-lv2/default.nix b/pkgs/applications/audio/aether-lv2/default.nix new file mode 100644 index 000000000000..e912c7fa49a4 --- /dev/null +++ b/pkgs/applications/audio/aether-lv2/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, lv2, libX11, libGL, libGLU, mesa, cmake }: + +stdenv.mkDerivation rec { + pname = "aether-lv2"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "Dougal-s"; + repo = "aether"; + rev = "v${version}"; + sha256 = "0xhih4smjxn87s0f4gaab51d8594qlp0lyypzxl5lm37j1i9zigs"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + lv2 libX11 libGL libGLU mesa + ]; + + installPhase = '' + mkdir -p $out/lib/lv2 + cp -r aether.lv2 $out/lib/lv2 + ''; + + meta = with lib; { + homepage = "https://dougal-s.github.io/Aether/"; + description = "An algorithmic reverb LV2 based on Cloudseed"; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70346e33d185..3102b39ac227 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -862,6 +862,8 @@ with pkgs; aescrypt = callPackage ../tools/misc/aescrypt { }; + aether-lv2 = callPackage ../applications/audio/aether-lv2 { }; + acme-client = callPackage ../tools/networking/acme-client { stdenv = gccStdenv; }; adriconf = callPackage ../tools/graphics/adriconf { }; From d9e363ca12b62e1ae34460182f9514fbff1e8a77 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 4 Sep 2021 15:40:48 +0200 Subject: [PATCH 35/90] surge-XT: init at unstable-2021-11-07 --- pkgs/applications/audio/surge-XT/default.nix | 33 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/audio/surge-XT/default.nix diff --git a/pkgs/applications/audio/surge-XT/default.nix b/pkgs/applications/audio/surge-XT/default.nix new file mode 100644 index 000000000000..6445723d7781 --- /dev/null +++ b/pkgs/applications/audio/surge-XT/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, cairo, libxkbcommon, xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor, alsa-lib, libjack2 +}: + +stdenv.mkDerivation rec { + pname = "surge-XT"; + version = "unstable-2021-11-07"; + + src = fetchFromGitHub { + owner = "surge-synthesizer"; + repo = "surge"; + rev = "ed93833eb44b177c977e3a7b878ffdd9bf9f24e5"; + sha256 = "0b164659ksl6h5nn7jja5zccx2mwzibqs6b7hg8l98gpcy9fi5r2"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ cairo libxkbcommon xcbutilcursor xcbutilkeysyms xcbutil libXrandr libXinerama libXcursor alsa-lib libjack2 ]; + + installPhase = '' + cd .. + cmake --build build --config Release --target install + ''; + + doInstallCheck = false; + + meta = with lib; { + description = "LV2 & VST3 synthesizer plug-in (previously released as Vember Audio Surge)"; + homepage = "https://surge-synthesizer.github.io"; + license = licenses.gpl3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ magnetophon orivej ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70346e33d185..94ee52c3f0ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28124,6 +28124,8 @@ with pkgs; git = gitMinimal; }; + surge-XT = callPackage ../applications/audio/surge-XT { }; + survex = callPackage ../applications/misc/survex { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; From 5641c103cd1146833e7608e4422e8b7a9e76abaf Mon Sep 17 00:00:00 2001 From: marius david Date: Fri, 5 Nov 2021 18:10:59 +0100 Subject: [PATCH 36/90] recastnavigation: init at 2021-03-05 --- .../libraries/recastnavigation/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/recastnavigation/default.nix diff --git a/pkgs/development/libraries/recastnavigation/default.nix b/pkgs/development/libraries/recastnavigation/default.nix new file mode 100644 index 000000000000..d39d1a713219 --- /dev/null +++ b/pkgs/development/libraries/recastnavigation/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchFromGitHub, cmake, libGL, SDL2, libGLU }: + +stdenv.mkDerivation rec { + pname = "recastai"; + # use latest revision for the CMake build process and OpenMW + # OpenMW use e75adf86f91eb3082220085e42dda62679f9a3ea + version = "unstable-2021-03-05"; + + src = fetchFromGitHub { + owner = "recastnavigation"; + repo = "recastnavigation"; + rev = "c5cbd53024c8a9d8d097a4371215e3342d2fdc87"; + sha256 = "sha256-QP3lMMFR6fiKQTksAkRL6X9yaoVz2xt4QSIP9g6piww="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libGL SDL2 libGLU ]; + + meta = with lib; { + homepage = "https://github.com/recastnavigation/recastnavigation"; + description = "Navigation-mesh Toolset for Games"; + license = licenses.zlib; + maintainers = with maintainers; [ marius851000 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca55821a01eb..3663ebf41a16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19200,6 +19200,8 @@ with pkgs; readosm = callPackage ../development/libraries/readosm { }; + recastnavigation = callPackage ../development/libraries/recastnavigation { }; + rinutils = callPackage ../development/libraries/rinutils { }; kissfft = callPackage ../development/libraries/kissfft { }; From da324abf24bbc1fbb0dbe4caa29e7b3015df8f61 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Mon, 8 Nov 2021 22:00:43 +1100 Subject: [PATCH 37/90] realvnc-vnc-viewer: 6.21.406 -> 6.21.920 --- pkgs/tools/admin/realvnc-vnc-viewer/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix index 690c215471cf..2e8eabfc1a36 100644 --- a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix +++ b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "realvnc-vnc-viewer"; - version = "6.21.406"; + version = "6.21.920"; src = { "x86_64-linux" = fetchurl { url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm"; - sha256 = "0rnizzanaykqg1vfy56p8abc4fmgpbibj54j4c1v81zsj3kmahka"; + sha256 = "1qghc5380h4b2pczksmky3kcffz5wn9shw033w4f969wl96p31fz"; }; "i686-linux" = fetchurl { url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x86.rpm"; - sha256 = "1rlxfiqymi1licn2spyiqa00kiwzhdr0pkh7vv3ai6gb9f6phk31"; + sha256 = "034iwqxpqhnm6i292fakva7vkwrrzamwcvbm7xyccpd54adj0grn"; }; - }.${stdenv.system}; + }.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); nativeBuildInputs = [ autoPatchelfHook rpmextract ]; buildInputs = [ libX11 libXext ]; From 14580c7f4deabea627e07b46118651b84759ad6d Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Mon, 8 Nov 2021 21:23:32 +1100 Subject: [PATCH 38/90] logisim-evolution: 3.5.0 -> 3.7.1 --- .../science/logic/logisim-evolution/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/logisim-evolution/default.nix b/pkgs/applications/science/logic/logisim-evolution/default.nix index 10266abffea1..cf7470b5475b 100644 --- a/pkgs/applications/science/logic/logisim-evolution/default.nix +++ b/pkgs/applications/science/logic/logisim-evolution/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logisim-evolution"; - version = "3.5.0"; + version = "3.7.1"; src = fetchurl { url = "https://github.com/logisim-evolution/logisim-evolution/releases/download/v${version}/logisim-evolution-${version}-all.jar"; - sha256 = "1r6im4gmjbnckx8jig6bxi5lxv06lwdnpxkyfalsfmw4nybd5arw"; + sha256 = "04q9bzhnzpi8cgv3ly4ii88qvmlw9n09c4p1qmg8dhxqkskdqj6h"; }; dontUnpack = true; @@ -30,8 +30,11 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/logisim-evolution --add-flags "-jar $src" - unzip $src resources/logisim/img/logisim-icon.svg - install -D resources/logisim/img/logisim-icon.svg $out/share/pixmaps/logisim-evolution.svg + # Create icons + unzip $src "resources/logisim/img/*" + for size in 16 32 48 128 256; do + install -D "./resources/logisim/img/logisim-icon-$size.png" "$out/share/icons/hicolor/''${size}x''${size}/apps/logisim-evolution.png" + done runHook postInstall ''; From e2df8d459ad8ad96b85292757765a8f1f0ed1115 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Mon, 8 Nov 2021 21:03:47 +1100 Subject: [PATCH 39/90] python3Packages.manimpango: init at 0.3.1 --- .../python-modules/manimpango/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/manimpango/default.nix diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix new file mode 100644 index 000000000000..95e035864711 --- /dev/null +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, pkg-config, pango, cython, AppKit, pytestCheckHook }: + +buildPythonPackage rec { + pname = "manimpango"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "ManimCommunity"; + repo = pname; + rev = "v${version}"; + sha256 = "ldZfvv5kloQ0uj0agxOP8cRh+Ix8f9Z0PT+pnhWYjiQ="; + }; + + postPatch = '' + substituteInPlace setup.cfg --replace "--cov --no-cov-on-fail" "" + ''; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ pango ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + propagatedBuildInputs = [ + cython + ]; + + preBuild = '' + ${python.interpreter} setup.py build_ext --inplace + ''; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "manimpango" ]; + + meta = with lib; { + homepage = "https://github.com/ManimCommunity/ManimPango"; + license = licenses.gpl3Plus; + description = "Binding for Pango"; + maintainers = [ maintainers.angustrau ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b6d07f926e1f..6d1ed03faa05 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4581,6 +4581,10 @@ in { manhole = callPackage ../development/python-modules/manhole { }; + manimpango = callPackage ../development/python-modules/manimpango { + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; + }; + manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix { }; manuel = callPackage ../development/python-modules/manuel { }; From 59f7048a542c0e73710619f67790ad7cba764b79 Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Mon, 8 Nov 2021 21:12:01 +1100 Subject: [PATCH 40/90] emote: 2.0.0 -> 3.0.3 --- pkgs/tools/inputmethods/emote/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/inputmethods/emote/default.nix b/pkgs/tools/inputmethods/emote/default.nix index d65831d5202e..79831d7ef1ec 100644 --- a/pkgs/tools/inputmethods/emote/default.nix +++ b/pkgs/tools/inputmethods/emote/default.nix @@ -2,18 +2,21 @@ python3Packages.buildPythonApplication rec { pname = "emote"; - version = "2.0.0"; + version = "3.0.3"; src = fetchFromGitHub { owner = "tom-james-watson"; repo = "Emote"; rev = "v${version}"; - sha256 = "kYXFD6VBnuEZ0ZMsF6ZmN4V0JN83puxRILpNlllVsKQ="; + sha256 = "mqCSl+EGbnL9AfzZT3aa/Y5Rsx433ZmI31BmK3wkaJk="; }; postPatch = '' - substituteInPlace setup.py --replace "pygobject==3.36.0" "pygobject" + substituteInPlace setup.py \ + --replace "pygobject==3.36.0" "pygobject" \ + --replace "manimpango==0.3.0" "manimpango" substituteInPlace emote/config.py --replace 'os.environ.get("SNAP")' "'$out/share/emote'" + substituteInPlace emote/picker.py --replace 'os.environ.get("SNAP_VERSION", "dev build")' "'$version'" substituteInPlace snap/gui/emote.desktop --replace "Icon=\''${SNAP}/usr/share/icons/emote.svg" "Icon=emote.svg" ''; @@ -27,6 +30,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = [ + python3Packages.manimpango python3Packages.pygobject3 gtk3 xdotool @@ -36,7 +40,7 @@ python3Packages.buildPythonApplication rec { postInstall = '' install -D snap/gui/emote.desktop $out/share/applications/emote.desktop install -D snap/gui/emote.svg $out/share/pixmaps/emote.svg - install -D -t $out/share/emote/static static/{emojis.json,logo.svg,style.css} + install -D -t $out/share/emote/static static/{NotoColorEmoji.ttf,emojis.csv,logo.svg,style.css} ''; dontWrapGApps = true; From aff0f5792be20059c35d1e740302255465e2cd27 Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 9 Nov 2021 08:15:53 -0500 Subject: [PATCH 41/90] plausible: add remote connection with iex --- nixos/modules/services/web-apps/plausible.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index 437c3f2df83b..b6c48186a1d3 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -9,6 +9,14 @@ in { options.services.plausible = { enable = mkEnableOption "plausible"; + releaseCookiePath = mkOption { + default = null; + type = with types; nullOr (either str path); + description = '' + The path to the file with release cookie. (used for remote connection to the running node). + ''; + }; + adminUser = { name = mkOption { default = "admin"; @@ -173,6 +181,8 @@ in { services.epmd.enable = true; + environment.systemPackages = [ pkgs.plausible ]; + systemd.services = mkMerge [ { plausible = { @@ -197,6 +207,8 @@ in { DISABLE_REGISTRATION = boolToString cfg.server.disableRegistration; RELEASE_TMP = "/var/lib/plausible/tmp"; + # Home is needed to connect to the node with iex + HOME = "/var/lib/plausible"; ADMIN_USER_NAME = cfg.adminUser.name; ADMIN_USER_EMAIL = cfg.adminUser.email; @@ -231,6 +243,9 @@ in { psql -d plausible <<< "UPDATE users SET email_verified=true;" fi ''} + ${optionalString (cfg.releaseCookiePath != null) '' + export RELEASE_COOKIE="$(< $CREDENTIALS_DIRECTORY/RELEASE_COOKIE )" + ''} plausible start ''; @@ -242,7 +257,8 @@ in { LoadCredential = [ "ADMIN_USER_PWD:${cfg.adminUser.passwordFile}" "SECRET_KEY_BASE:${cfg.server.secretKeybaseFile}" - ] ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [ "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"]; + ] ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [ "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"] + ++ lib.optionals (cfg.releaseCookiePath != null) [ "RELEASE_COOKIE:${cfg.releaseCookiePath}"]; }; }; } From 0d7268648eae7fbb9d05a2c76c893e84a6a0116d Mon Sep 17 00:00:00 2001 From: marius david Date: Fri, 5 Nov 2021 18:33:09 +0100 Subject: [PATCH 42/90] collada-dom: init at rdiankov-2020-01-03 --- .../libraries/collada-dom/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/collada-dom/default.nix diff --git a/pkgs/development/libraries/collada-dom/default.nix b/pkgs/development/libraries/collada-dom/default.nix new file mode 100644 index 000000000000..1cb5c4853969 --- /dev/null +++ b/pkgs/development/libraries/collada-dom/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, cmake, boost, libxml2, minizip, readline }: + +stdenv.mkDerivation { + pname = "collada-dom"; + version = "unstable-2020-01-03"; + + src = fetchFromGitHub { + owner = "rdiankov"; + repo = "collada-dom"; + rev = "c1e20b7d6ff806237030fe82f126cb86d661f063"; + sha256 = "sha256-A1ne/D6S0shwCzb9spd1MoSt/238HWA8dvgd+DC9cXc="; + }; + + postInstall = '' + chmod +w -R $out + ln -s $out/include/*/* $out/include + ''; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + boost + libxml2 + minizip + readline + ]; + + meta = with lib; { + description = "Lightweight version of collada-dom, with only the parser."; + homepage = "https://github.com/rdiankov/collada-dom"; + license = licenses.mit; + maintainers = with maintainers; [ marius851000 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3663ebf41a16..26cfd72ec40e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15818,6 +15818,8 @@ with pkgs; cointop = callPackage ../applications/misc/cointop { }; + collada-dom = callPackage ../development/libraries/collada-dom { }; + cog = callPackage ../development/web/cog { }; cosmopolitan = callPackage ../development/libraries/cosmopolitan { }; From 84dbadf81a0ab6291c978452d2479f5014cfd08d Mon Sep 17 00:00:00 2001 From: marius david Date: Fri, 5 Nov 2021 19:27:15 +0100 Subject: [PATCH 43/90] openscenegraph: fix collada support --- pkgs/development/libraries/openscenegraph/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 6b446882ba13..6ed7d846de20 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -2,6 +2,7 @@ libX11, libXinerama, libXrandr, libGLU, libGL, glib, ilmbase, libxml2, pcre, zlib, AGL, Carbon, Cocoa, Foundation, + boost, jpegSupport ? true, libjpeg, exrSupport ? false, openexr, gifSupport ? true, giflib, @@ -9,7 +10,7 @@ tiffSupport ? true, libtiff, gdalSupport ? false, gdal, curlSupport ? true, curl, - colladaSupport ? false, opencollada, + colladaSupport ? false, collada-dom, opencascadeSupport ? false, opencascade, ffmpegSupport ? false, ffmpeg, nvttSupport ? false, nvidia-texture-tools, @@ -20,7 +21,7 @@ lasSupport ? false, libLAS, luaSupport ? false, lua, sdlSupport ? false, SDL2, - restSupport ? false, asio, boost, + restSupport ? false, asio, withApps ? false, withExamples ? false, fltk, wxGTK, }: @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { ++ lib.optional tiffSupport libtiff ++ lib.optional gdalSupport gdal ++ lib.optional curlSupport curl - ++ lib.optional colladaSupport opencollada + ++ lib.optional colladaSupport collada-dom ++ lib.optional opencascadeSupport opencascade ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional nvttSupport nvidia-texture-tools @@ -59,9 +60,10 @@ stdenv.mkDerivation rec { ++ lib.optional lasSupport libLAS ++ lib.optional luaSupport lua ++ lib.optional sdlSupport SDL2 - ++ lib.optionals restSupport [ asio boost ] + ++ lib.optional restSupport asio ++ lib.optionals withExamples [ fltk wxGTK ] ++ lib.optionals stdenv.isDarwin [ AGL Carbon Cocoa Foundation ] + ++ lib.optional (restSupport || colladaSupport) boost ; cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON"; From 5a63a08cce2a54e020f048b13d59868a0eb7f258 Mon Sep 17 00:00:00 2001 From: Jens Nolte Date: Tue, 9 Nov 2021 22:31:15 +0100 Subject: [PATCH 44/90] matrix-commander: Add notify2 dependency to enable --os-notify feature --- .../networking/instant-messengers/matrix-commander/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index 2ebf762c418b..c4f268871e87 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation { pillow urllib3 aiofiles + notify2 ]))]; installPhase = '' From dbcbf262506692963ed5d87c6125783c90aa6ede Mon Sep 17 00:00:00 2001 From: Lionello Lunesu Date: Tue, 9 Nov 2021 21:49:54 -0800 Subject: [PATCH 45/90] ldc-bootstrap: 1.19.0 -> 1.25.0 This also enables building on aarch64-darwin. --- pkgs/development/compilers/ldc/binary.nix | 6 +++--- pkgs/development/compilers/ldc/bootstrap.nix | 9 +++++---- pkgs/development/compilers/ldc/generic.nix | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/ldc/binary.nix b/pkgs/development/compilers/ldc/binary.nix index 7b43a2c2e8d8..05928d396c86 100644 --- a/pkgs/development/compilers/ldc/binary.nix +++ b/pkgs/development/compilers/ldc/binary.nix @@ -3,8 +3,8 @@ let inherit (stdenv) hostPlatform; - OS = if stdenv.hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; - ARCH = toString hostPlatform.parsed.cpu.name; + OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; + ARCH = if hostPlatform.isDarwin && hostPlatform.isAarch64 then "arm64" else hostPlatform.parsed.cpu.name; in stdenv.mkDerivation { pname = "ldc-bootstrap"; inherit version; @@ -37,6 +37,6 @@ in stdenv.mkDerivation { # from https://github.com/ldc-developers/ldc/blob/master/LICENSE license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; maintainers = with maintainers; [ ThomasMader lionello ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/ldc/bootstrap.nix b/pkgs/development/compilers/ldc/bootstrap.nix index fde4c8426848..18c656b27f2f 100644 --- a/pkgs/development/compilers/ldc/bootstrap.nix +++ b/pkgs/development/compilers/ldc/bootstrap.nix @@ -1,10 +1,11 @@ { callPackage }: callPackage ./binary.nix { - version = "1.19.0"; + version = "1.25.0"; hashes = { # Get these from `nix-prefetch-url https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc.. - osx-x86_64 = "1bp3xkh9zp64dzq8isanib1gacb3nfbl70qv15qygwk1zan6zgy7"; - linux-x86_64 = "146grr2lwarfk13wgkpyb77xb6b3as1is2rf4s2hipqjmc8biy1h"; - linux-aarch64 = "1fv6jshfvi15m7masgxq1hgp216qjd5amizrqdf26vhrq3a08li3"; + osx-x86_64 = "1xaqxf1lz8kdb0n5iycfpxpvabf1zy0akg14kg554sm85xnsf8pa"; + linux-x86_64 = "1shzdq564jg3ga1hwrvpx30lpszc6pqndqndr5mqmc352znkiy5i"; + linux-aarch64 = "04i4xxwhq02d98r3qrrnv5dbd4xr4d7ph3zv94z2m58z3vgphdjh"; + osx-arm64 = "0b0cpgzn23clggx0cvdaja29q7w7ihkmjbnf1md03h9h5nzp9z1v"; }; } diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/development/compilers/ldc/generic.nix index f79fb24a56b4..93ee83cb0abe 100644 --- a/pkgs/development/compilers/ldc/generic.nix +++ b/pkgs/development/compilers/ldc/generic.nix @@ -132,6 +132,6 @@ stdenv.mkDerivation rec { # from https://github.com/ldc-developers/ldc/blob/master/LICENSE license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; maintainers = with maintainers; [ ThomasMader lionello ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } From ed256b9c89cd625d35f75a183414a8865b335449 Mon Sep 17 00:00:00 2001 From: Pasquale Date: Tue, 9 Nov 2021 15:01:27 +0100 Subject: [PATCH 46/90] bismuth:init at 2.1.0 --- .../bismuth/0001-Avoid-usage-of-npx.patch | 37 ++++++++++++++ .../3rdparty/addons/bismuth/default.nix | 48 +++++++++++++++++++ pkgs/desktops/plasma-5/default.nix | 1 + 3 files changed, 86 insertions(+) create mode 100644 pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-Avoid-usage-of-npx.patch create mode 100644 pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-Avoid-usage-of-npx.patch b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-Avoid-usage-of-npx.patch new file mode 100644 index 000000000000..34e06d77bd29 --- /dev/null +++ b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/0001-Avoid-usage-of-npx.patch @@ -0,0 +1,37 @@ +From c9aaff2461daba31a25ed20c0789ffd7c3561887 Mon Sep 17 00:00:00 2001 +From: Pasquale +Date: Tue, 9 Nov 2021 23:12:50 +0100 +Subject: [PATCH] Avoid usage of npx + +tsc is only used for checking type annotation +that are stripped by esbuild + +--- + src/kwinscript/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/kwinscript/CMakeLists.txt b/src/kwinscript/CMakeLists.txt +index 6d85d5d..6f966a4 100644 +--- a/src/kwinscript/CMakeLists.txt ++++ b/src/kwinscript/CMakeLists.txt +@@ -29,7 +29,7 @@ add_custom_target( + + add_custom_command( + OUTPUT "bismuth/contents/code/index.mjs" +- COMMAND "npx" "esbuild" ++ COMMAND "esbuild" + "--bundle" "${CMAKE_CURRENT_SOURCE_DIR}/index.ts" + "--outfile=${CMAKE_CURRENT_BINARY_DIR}/bismuth/contents/code/index.mjs" + "--format=esm" +@@ -40,7 +40,7 @@ add_custom_command( + + add_custom_target( + LintViaTSC +- COMMAND "npx" "tsc" "--noEmit" "--incremental" ++ COMMAND "true" + COMMENT "👮 Checking sources using TS Compiler..." + ) + +-- +2.33.1 + diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix new file mode 100644 index 000000000000..114eb31e69ce --- /dev/null +++ b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix @@ -0,0 +1,48 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, kcoreaddons +, kwindowsystem +, plasma-framework +, systemsettings +, cmake +, extra-cmake-modules +, esbuild +}: + +mkDerivation rec { + pname = "bismuth"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "Bismuth-Forge"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-ICpGgFvVi7tiYbMCo3JWQmbA36rdWF4NFYTWIejhxr4="; + }; + + patches = [ + ./0001-Avoid-usage-of-npx.patch + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + esbuild + ]; + + buildInputs = [ + kcoreaddons + kwindowsystem + plasma-framework + systemsettings + ]; + + meta = with lib; { + description = "A dynamic tiling extension for KWin"; + license = licenses.mit; + maintainers = with maintainers; [ pasqui23 ]; + homepage = "https://bismuth-forge.github.io/bismuth/"; + inherit (kwindowsystem.meta) platforms; + }; +} diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index e5a239308886..8abf2b37dbec 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -155,6 +155,7 @@ let thirdParty = let inherit (libsForQt5) callPackage; in { plasma-applet-caffeine-plus = callPackage ./3rdparty/addons/caffeine-plus.nix { }; plasma-applet-virtual-desktop-bar = callPackage ./3rdparty/addons/virtual-desktop-bar.nix { }; + bismuth = callPackage ./3rdparty/addons/bismuth { }; kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { }; kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { }; krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { }; From c571aa7642edf85ddeb7a2a775640c22b3e3d0e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 7 Nov 2021 14:25:23 -0800 Subject: [PATCH 47/90] libdeltachat: 1.60.0 -> 1.63.0 --- .../libraries/libdeltachat/darwin-dylib.patch | 53 +++++++++++++++++++ .../libraries/libdeltachat/default.nix | 17 ++---- .../libdeltachat/no-static-lib.patch | 9 ++-- 3 files changed, 61 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/libraries/libdeltachat/darwin-dylib.patch diff --git a/pkgs/development/libraries/libdeltachat/darwin-dylib.patch b/pkgs/development/libraries/libdeltachat/darwin-dylib.patch new file mode 100644 index 000000000000..caa44a62a062 --- /dev/null +++ b/pkgs/development/libraries/libdeltachat/darwin-dylib.patch @@ -0,0 +1,53 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5ed8020c..44ca43e7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,12 +2,20 @@ cmake_minimum_required(VERSION 3.16) + project(deltachat LANGUAGES C) + include(GNUInstallDirs) + ++if(APPLE) ++ set(DYNAMIC_EXT "dylib") ++elseif(UNIX) ++ set(DYNAMIC_EXT "so") ++else() ++ set(DYNAMIC_EXT "dll") ++endif() ++ + find_program(CARGO cargo) + + add_custom_command( + OUTPUT + "target/release/libdeltachat.a" +- "target/release/libdeltachat.so" ++ "target/release/libdeltachat.${DYNAMIC_EXT}" + "target/release/pkgconfig/deltachat.pc" + COMMAND + PREFIX=${CMAKE_INSTALL_PREFIX} +@@ -32,11 +40,11 @@ add_custom_target( + ALL + DEPENDS + "target/release/libdeltachat.a" +- "target/release/libdeltachat.so" ++ "target/release/libdeltachat.${DYNAMIC_EXT}" + "target/release/pkgconfig/deltachat.pc" + ) + + install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-install(FILES "target/release/libdeltachat.so" DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +diff --git a/python/install_python_bindings.py b/python/install_python_bindings.py +index c8ed43e2..714c7e30 100755 +--- a/python/install_python_bindings.py ++++ b/python/install_python_bindings.py +@@ -24,7 +24,7 @@ + + print("running:", " ".join(cmd)) + subprocess.check_call(cmd) +- subprocess.check_call("rm -rf build/ src/deltachat/*.so" , shell=True) ++ subprocess.check_call("rm -rf build/ src/deltachat/*.so src/deltachat/*.dylib" , shell=True) + + if len(sys.argv) <= 1 or sys.argv[1] != "onlybuild": + subprocess.check_call([ diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 9cc0ca65ae0b..70b6cfe3d9c8 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , openssl , perl @@ -16,33 +15,25 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.60.0"; + version = "1.63.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - sha256 = "1agm5xyaib4ynmw4mhgmkhh4lnxs91wv0q9i1zfihv2vkckfm2s2"; + sha256 = "1511jh38h7nmn4dpyi1vfxvhybcacc6gavwfifxvb5npirphziga"; }; patches = [ # https://github.com/deltachat/deltachat-core-rust/pull/2589 - (fetchpatch { - url = "https://github.com/deltachat/deltachat-core-rust/commit/408467e85d04fbbfd6bed5908d84d9e995943487.patch"; - sha256 = "1j2ywaazglgl6370js34acrg0wrh0b7krqg05dfjf65n527lzn59"; - }) + ./darwin-dylib.patch ./no-static-lib.patch - # https://github.com/deltachat/deltachat-core-rust/pull/2660 - (fetchpatch { - url = "https://github.com/deltachat/deltachat-core-rust/commit/8fb5e038a97d8ae68564c885d61b93127a68366d.patch"; - sha256 = "088pzfrrkgfi4646dc72404s3kykcpni7hgkppalwlzg0p4is41x"; - }) ]; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "09d3mw2hb1gmqg7smaqwnfm7izw40znl0h1dz7s2imms2cnkjws1"; + sha256 = "0hfp2k84mvq11h7q96hkcj3k6f3sxw8wx89acg4hy6lbh8xpy6ai"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libdeltachat/no-static-lib.patch b/pkgs/development/libraries/libdeltachat/no-static-lib.patch index 95238cf88524..14ea1106138f 100644 --- a/pkgs/development/libraries/libdeltachat/no-static-lib.patch +++ b/pkgs/development/libraries/libdeltachat/no-static-lib.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index fe7abe08..acdbe0d6 100644 +index 44ca43e7..8b6960dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -13,7 +13,6 @@ find_program(CARGO cargo) +@@ -14,7 +14,6 @@ find_program(CARGO cargo) add_custom_command( OUTPUT @@ -10,7 +10,7 @@ index fe7abe08..acdbe0d6 100644 "target/release/libdeltachat.${DYNAMIC_EXT}" "target/release/pkgconfig/deltachat.pc" COMMAND -@@ -38,13 +37,11 @@ add_custom_target( +@@ -39,12 +38,10 @@ add_custom_target( lib_deltachat ALL DEPENDS @@ -19,13 +19,12 @@ index fe7abe08..acdbe0d6 100644 "target/release/pkgconfig/deltachat.pc" ) - include(GNUInstallDirs) install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml -index a34a27ba..cf354abb 100644 +index de0fbafe..120efec9 100644 --- a/deltachat-ffi/Cargo.toml +++ b/deltachat-ffi/Cargo.toml @@ -12,7 +12,7 @@ categories = ["cryptography", "std", "email"] From 556a9817333431bf0670a18e2d0d5a0e3085cdb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 7 Nov 2021 17:00:40 -0800 Subject: [PATCH 48/90] kdeltachat: unstable-2021-09-10 -> unstable-2021-10-27 --- .../networking/instant-messengers/kdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index a7cd9116195b..c9cbdd379864 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2021-09-10"; + version = "unstable-2021-10-27"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "40092aa096bac7e279eb5a4cc97758bac484236c"; - sha256 = "0vmsbxx4hxh35v1lbj82vq2w8z8inj83xpf24wzlbdr9inlbmym4"; + rev = "e1201cdcce4311061643d90cc0132745023a82d2"; + sha256 = "04xqvyj4rzgl9r7sfjjw1kc3vql30c80rwppff2zr5aijr15fgjj"; }; nativeBuildInputs = [ From ed4170733c141b610484fc452f1d0a0302213abd Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Wed, 10 Nov 2021 14:12:01 -0700 Subject: [PATCH 49/90] amis: enable setting ami boot mode on registration This is important since legacy bios mode is still the default for Intel and AMD based instances on AWS. That is, even if your image is setup to use UEFI on the OS level, the AMI will still use BIOS unless the boot mode is explicitly set during registration. --- nixos/maintainers/scripts/ec2/amazon-image.nix | 5 +++++ nixos/maintainers/scripts/ec2/create-amis.sh | 1 + 2 files changed, 6 insertions(+) diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index fcb369e87ff9..6358ec68f7cf 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.amazonImage; + amiBootMode = if config.ec2.efi then "uefi" else "legacy-bios"; in { @@ -106,10 +107,12 @@ in { --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ --arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ --arg boot_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg boot_mode "${amiBootMode}" \ --arg root "$rootDisk" \ --arg boot "$bootDisk" \ '{} | .label = $system_label + | .boot_mode = $boot_mode | .system = $system | .disks.boot.logical_bytes = $boot_logical_bytes | .disks.boot.file = $boot @@ -145,9 +148,11 @@ in { --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ --arg logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg boot_mode "${amiBootMode}" \ --arg file "$diskImage" \ '{} | .label = $system_label + | .boot_mode = $boot_mode | .system = $system | .logical_bytes = $logical_bytes | .file = $file diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 355894587391..1df27e2db55a 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -275,6 +275,7 @@ upload_image() { --region "$region" \ --architecture $amazon_arch \ --block-device-mappings "${block_device_mappings[@]}" \ + --boot-mode $(read_image_info .boot_mode) \ "${extra_flags[@]}" \ | jq -r '.ImageId' ) From dc8a634b45db3afa9a58e53d6f99a2a5328e7aec Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 11 Nov 2021 04:20:00 +0000 Subject: [PATCH 50/90] terraform: 1.0.10 -> 1.0.11 https://github.com/hashicorp/terraform/releases/tag/v1.0.11 --- pkgs/applications/networking/cluster/terraform/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 8dfc8c701e3a..036ee7d8243f 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -195,9 +195,9 @@ rec { }; terraform_1_0 = mkTerraform { - version = "1.0.10"; - sha256 = "1jcgp9q99785m85754ipza7b3dd3g58adpnyh5w2imqj01cas6mb"; - vendorSha256 = "00cl42w1mzsi9qd09wydfvp5f2h7lxaay6s2dv0mf47k6h7prf42"; + version = "1.0.11"; + sha256 = "0k05s4zm16vksq21f1q00y2lzfgi5fhs1ygydm8jk0srs9x8ask7"; + vendorSha256 = "1brgghl7fb26va4adix443rl1dkjaqrr4jkknxjkcaps0knqp172"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }; From 32bd7aaf320a14f209df61c2f82fd4dc4a71c44b Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Wed, 10 Nov 2021 23:54:42 -0700 Subject: [PATCH 51/90] sublime-music: 0.11.14 -> 0.11.16 The failing tests have been fixed upstream --- pkgs/applications/audio/sublime-music/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index 655290020156..3f7e1e038f8e 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "sublime-music"; - version = "0.11.14"; + version = "0.11.16"; format = "pyproject"; src = fetchFromGitLab { owner = "sublime-music"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NzbQtRcsRVppyuG1UuS3IidSnniUOavf5YoAf/kcZqw="; + sha256 = "sha256-n77mTgElwwFaX3WQL8tZzbkPwnsyQ08OW9imSOjpBlg="; }; nativeBuildInputs = [ @@ -71,7 +71,7 @@ python3Packages.buildPythonApplication rec { ]; checkPhase = '' - ${xvfb-run}/bin/xvfb-run pytest -k "not test_json_load_unload" + ${xvfb-run}/bin/xvfb-run pytest ''; pythonImportsCheck = [ From 5c97298a87b74a13d2e7493327f2be06c9598c34 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Nov 2021 10:04:25 +0100 Subject: [PATCH 52/90] python3Packages.pytraccar: init at 0.10.0 --- .../python-modules/pytraccar/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/pytraccar/default.nix diff --git a/pkgs/development/python-modules/pytraccar/default.nix b/pkgs/development/python-modules/pytraccar/default.nix new file mode 100644 index 000000000000..dd14bcfaadc0 --- /dev/null +++ b/pkgs/development/python-modules/pytraccar/default.nix @@ -0,0 +1,51 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pytest-asyncio +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pytraccar"; + version = "0.10.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ludeeus"; + repo = pname; + rev = version; + sha256 = "08f7rwvbc1h17lvgv9823ssd3p0vw7yzsg40lbkacgqqiv1hxfzs"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + aresponses + pytestCheckHook + pytest-asyncio + ]; + + postPatch = '' + # Upstream doesn't set version in the repo + substituteInPlace setup.py \ + --replace 'version="master",' 'version="${version}",' + ''; + + pythonImportsCheck = [ + "pytraccar" + ]; + + meta = with lib; { + description = "Python library to handle device information from Traccar"; + homepage = "https://github.com/ludeeus/pytraccar"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff164908e448..ec3d80104885 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7717,6 +7717,8 @@ in { cudaSupport = false; }; + pytraccar = callPackage ../development/python-modules/pytraccar { }; + pytradfri = callPackage ../development/python-modules/pytradfri { }; pytrafikverket = callPackage ../development/python-modules/pytrafikverket { }; From 60b0709f561eafe535fa8defe11af3b0f4de537f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Nov 2021 10:06:00 +0100 Subject: [PATCH 53/90] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index c41791a90540..9e7c7976a41b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -890,7 +890,7 @@ "touchline" = ps: with ps; [ ]; # missing inputs: pytouchline "tplink" = ps: with ps; [ aiohttp-cors ifaddr python-kasa ]; "tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected - "traccar" = ps: with ps; [ aiohttp-cors stringcase ]; # missing inputs: pytraccar + "traccar" = ps: with ps; [ aiohttp-cors pytraccar stringcase ]; "trace" = ps: with ps; [ ]; "tractive" = ps: with ps; [ aiotractive ]; "tradfri" = ps: with ps; [ pytradfri ]; From 9122117a424986e0c8f78135f4bb0f3ea2047311 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Nov 2021 10:07:37 +0100 Subject: [PATCH 54/90] home-assistant: enable traccar tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index affe1e6c205e..c47c7376a3ac 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -662,6 +662,7 @@ in with py.pkgs; buildPythonApplication rec { "toon" "totalconnect" "tplink" + "traccar" "trace" "tradfri" "transmission" From 64572a82cc8c8e60183ed4021c2a1d4b28c16ab1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Nov 2021 10:18:40 +0100 Subject: [PATCH 55/90] python3Packages.pyuptimerobot: init at 21.11.0 --- .../python-modules/pyuptimerobot/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/pyuptimerobot/default.nix diff --git a/pkgs/development/python-modules/pyuptimerobot/default.nix b/pkgs/development/python-modules/pyuptimerobot/default.nix new file mode 100644 index 000000000000..6334c3f64c08 --- /dev/null +++ b/pkgs/development/python-modules/pyuptimerobot/default.nix @@ -0,0 +1,51 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pytest-asyncio +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyuptimerobot"; + version = "21.11.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ludeeus"; + repo = pname; + rev = version; + sha256 = "1nmmwp9m38b75lz51ypcj0qxnxm9wq4id5cggl0pn2rx6gwnbw9n"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + aresponses + pytestCheckHook + pytest-asyncio + ]; + + postPatch = '' + # Upstream doesn't set version in the repo + substituteInPlace setup.py \ + --replace 'version="main",' 'version="${version}",' + ''; + + pythonImportsCheck = [ + "pyuptimerobot" + ]; + + meta = with lib; { + description = "Python API wrapper for Uptime Robot"; + homepage = "https://github.com/ludeeus/pyuptimerobot"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff164908e448..efd37ea8837d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7766,6 +7766,8 @@ in { pyupgrade = callPackage ../development/python-modules/pyupgrade { }; + pyuptimerobot = callPackage ../development/python-modules/pyuptimerobot { }; + pyusb = callPackage ../development/python-modules/pyusb { inherit (pkgs) libusb1; }; From 32d63aec97c7bcf2f37bddbceb05fc55264213c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Nov 2021 10:19:46 +0100 Subject: [PATCH 56/90] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index c41791a90540..b58ef3a0d729 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -922,7 +922,7 @@ "updater" = ps: with ps; [ ]; "upnp" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ]; "uptime" = ps: with ps; [ ]; - "uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot + "uptimerobot" = ps: with ps; [ pyuptimerobot ]; "usb" = ps: with ps; [ aiohttp-cors pyserial pyudev ]; "uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus "usgs_earthquakes_feed" = ps: with ps; [ geojson-client ]; From 5bfe45de8bbcb47382e5788ed0040353457b2b39 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Nov 2021 10:23:33 +0100 Subject: [PATCH 57/90] home-assistant: enable uptimerobot tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index affe1e6c205e..c9ddf6c5120d 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -683,6 +683,7 @@ in with py.pkgs; buildPythonApplication rec { # disabled, because it tries to join a multicast group and fails to find a usable network interface # "upnp" "uptime" + "uptimerobot" "usgs_earthquakes_feed" "utility_meter" "uvc" From 14acb1006290d27fa87e58f151fd483b3622b3d9 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 11 Nov 2021 11:32:15 +0100 Subject: [PATCH 58/90] libbsd: make libmd a propagated build input Dependencies like `eid-mw` need it to include md5.h. --- pkgs/development/libraries/libbsd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index ecea00086585..745b34226e2d 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # darwin changes configure.ac which means we need to regenerate # the configure scripts nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libmd ]; + propagatedBuildInputs = [ libmd ]; patches = [ ./darwin.patch ]; From 646685933ed90c70bfd4ef637ecb1f60f121a2f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Nov 2021 11:41:41 +0100 Subject: [PATCH 59/90] python3Packages.panacotta: init at 0.1 --- .../python-modules/panacotta/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/panacotta/default.nix diff --git a/pkgs/development/python-modules/panacotta/default.nix b/pkgs/development/python-modules/panacotta/default.nix new file mode 100644 index 000000000000..efaee8a42168 --- /dev/null +++ b/pkgs/development/python-modules/panacotta/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "panacotta"; + version = "0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "u1f35c"; + repo = "python-panacotta"; + rev = "panacotta-${version}"; + sha256 = "0v2fa18n50iy18n22klkgjral728iplj6yk3b6hjkzas5dk9wd9c"; + }; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "panacotta" + ]; + + meta = with lib; { + description = "Python API for controlling Panasonic Blu-Ray players"; + homepage = "https://github.com/u1f35c/python-panacotta"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff164908e448..af7f839719e8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5420,6 +5420,8 @@ in { pamqp = callPackage ../development/python-modules/pamqp { }; + panacotta = callPackage ../development/python-modules/panacotta { }; + pandas = callPackage ../development/python-modules/pandas { }; pandas-datareader = callPackage ../development/python-modules/pandas-datareader { }; From fc9a7448ebbbb2a16ec021270d320001b2dbc20e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Nov 2021 11:42:44 +0100 Subject: [PATCH 60/90] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index c41791a90540..dbb65130e0c7 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -631,7 +631,7 @@ "owntracks" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors hass-nabucasa paho-mqtt ]; "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ]; "p1_monitor" = ps: with ps; [ p1monitor ]; - "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta + "panasonic_bluray" = ps: with ps; [ panacotta ]; "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "pandora" = ps: with ps; [ pexpect ]; "panel_custom" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; From 2de530ad99deb9c0fe13af43ae20e40114092799 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Nov 2021 12:16:49 +0100 Subject: [PATCH 61/90] flexget: 3.1.149 -> 3.1.150 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 22fd08e3f4a8..c4f54a756b76 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.1.149"; + version = "3.1.150"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "1yrb8cfrc6y7gpfgzn0q6ldx9vk06qp229wjs4q8rccp72p6d6gg"; + sha256 = "sha256-tSA1pDGzIX2uIEWM0xV53jj1vBcJFMNCRakczs7Hue4="; }; postPatch = '' From 3c754c3b4561f455ce24f74163888815b9006620 Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 11 Nov 2021 13:08:52 +0100 Subject: [PATCH 62/90] tilix: fix nixpkgs-review-checks suggestion --- pkgs/applications/terminal-emulators/tilix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix index a5c4b4574df3..c217ae7f991d 100644 --- a/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/pkgs/applications/terminal-emulators/tilix/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; - rev = "${version}"; + rev = version; sha256 = "sha256:020gr4q7kmqq8vnsh8rw97gf1p2n1yq4d7ncyjjh9l13zkaxqqv9"; }; From 6d497c8b5bce009aec5a92f90e5770b6305ae343 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Nov 2021 13:54:29 +0100 Subject: [PATCH 63/90] python3Packages.xarray: 0.19.0 -> 0.20.1 --- pkgs/development/python-modules/xarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index ee07adeb9d5b..602bbac89aec 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.19.0"; + version = "0.20.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3a365ce09127fc841ba88baa63f37ca61376ffe389a6c5e66d52f2c88c23a62b"; + sha256 = "9c0bffd8b55fdef277f8f6c817153eb51fa4e58653a7ad92eaed9984164b7bdb"; }; nativeBuildInputs = [ setuptools-scm ]; From 38a9cc1745418694c15ff2db1ef22804367d1a2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 11 Nov 2021 14:46:17 +0100 Subject: [PATCH 64/90] smartdeblur: switch to fetchFromGitHub, update meta --- .../graphics/smartdeblur/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index ccde0c0d9ecb..c82e22ae0ca8 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -1,13 +1,14 @@ -{ fetchurl, lib, stdenv, cmake, qt4, fftw }: +{ lib, stdenv, fetchFromGitHub, cmake, qt4, fftw }: stdenv.mkDerivation rec { pname = "smartdeblur"; version = "unstable-2013-01-09"; - src = fetchurl { - url = "https://github.com/Y-Vladimir/SmartDeblur/tarball/9895036d26"; - name = "smartdeblur-${version}.tar.gz"; - sha256 = "126x9x1zhqdarjz9in0p1qhmqg3jwz7frizadjvx723g2ppi33s4"; + src = fetchFromGitHub { + owner = "Y-Vladimir"; + repo = "SmartDeblur"; + rev = "9895036d26cbb823a9ade28cdcb26fd0ac37258e"; + sha256 = "sha256-+EbqEpOG1fj2OKmlz8NRF/CGfT2OYGwY5/lwJHCHaMw="; }; preConfigure = '' @@ -19,11 +20,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_SYSTEM_FFTW=ON" ]; - meta = { + meta = with lib; { homepage = "https://github.com/Y-Vladimir/SmartDeblur"; description = "Tool for restoring blurry and defocused images"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ ]; - platforms = with lib.platforms; linux; + license = licenses.gpl3; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; }; } From 662abd6a3cb32aef2b15a3d437a9ed2715693951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 11 Nov 2021 14:46:52 +0100 Subject: [PATCH 65/90] helm-docs: remove default platform --- pkgs/applications/networking/cluster/helm-docs/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/helm-docs/default.nix b/pkgs/applications/networking/cluster/helm-docs/default.nix index 346284d3eab0..7214530a046d 100644 --- a/pkgs/applications/networking/cluster/helm-docs/default.nix +++ b/pkgs/applications/networking/cluster/helm-docs/default.nix @@ -23,7 +23,6 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/norwoodj/helm-docs"; description = "A tool for automatically generating markdown documentation for Helm charts"; - platforms = platforms.unix; license = licenses.gpl3Only; maintainers = with maintainers; [ sagikazarmark ]; }; From 4759d5e60c30f6619e30dc2eeb18629242f5ec8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 11 Nov 2021 14:47:03 +0100 Subject: [PATCH 66/90] glog: remove extra lib --- pkgs/development/libraries/glog/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 38cd40377a5c..72758a1b3e77 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; description = "Library for application-level logging"; platforms = platforms.unix; - maintainers = with lib.maintainers; [ nh2 r-burns ]; + maintainers = with maintainers; [ nh2 r-burns ]; }; } From e3003d541f455bdcc27e00f6406f4988da2150a0 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 31 Oct 2021 01:20:51 +0000 Subject: [PATCH 67/90] python3Packages.dask: 2021.09.1 -> 2021.10.0 --- pkgs/development/python-modules/dask/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 68e5304932df..39d01559d460 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -5,6 +5,7 @@ , cloudpickle , distributed , fetchFromGitHub +, fetchpatch , fsspec , jinja2 , numpy @@ -22,7 +23,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2021.09.1"; + version = "2021.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,9 +32,19 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - sha256 = "sha256-+UkbXbWV5R/QtVb5rWm/5SA+IoWsIfBciL3vg138jkc="; + sha256 = "07ysrs46x5w8rc2df0j06rsw58ahcysd6lwjk5riqpjlpwdfmg7p"; }; + patches = [ + # remove with next bump + (fetchpatch { + name = "fix-tests-against-distributed-2021.10.0.patch"; + url = "https://github.com/dask/dask/commit/cd65507841448ad49001cf27564102e2fb964d0a.patch"; + includes = [ "dask/tests/test_distributed.py" ]; + sha256 = "1i4i4k1lzxcydq9l80jyifq21ny0j3i47rviq07ai488pvx1r2al"; + }) + ]; + propagatedBuildInputs = [ cloudpickle fsspec From 37d00bbcf112de941872ba24233b71fbc89aa9a5 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 2 Nov 2021 00:26:33 +0000 Subject: [PATCH 68/90] python3Packages.streamz: 0.6.2 -> 0.6.3 convert to pytestCheckHook, add patch to fix tests against distributed-2021.10.0 --- .../python-modules/streamz/default.nix | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index ee96efe5e01f..bb3e2b68cb14 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -14,6 +14,7 @@ , toolz , tornado , zict +, fetchpatch }: buildPythonPackage rec { @@ -28,6 +29,16 @@ buildPythonPackage rec { sha256 = "sha256-0wZ1ldLFRAIL9R+gLfwsFbL+gvdORAkYWNjnDmeafm8="; }; + patches = [ + # remove with next bump + (fetchpatch { + name = "fix-tests-against-distributed-2021.10.0.patch"; + url = "https://github.com/python-streamz/streamz/commit/5bd3bc4d305ff40c740bc2550c8491be9162778a.patch"; + sha256 = "1xzxcbf7yninkyizrwm3ahqk6ij2fmh0454iqjx2n7mmzx3sazx7"; + includes = ["streamz/tests/test_dask.py"]; + }) + ]; + propagatedBuildInputs = [ networkx six @@ -46,22 +57,23 @@ buildPythonPackage rec { requests ]; - disabledTests = [ - # Disable test_tcp_async because fails on sandbox build - "test_partition_timeout" - "test_tcp_async" - "test_tcp" - ]; - - disabledTestPaths = [ - # Disable kafka tests - "streamz/tests/test_kafka.py" - ]; - pythonImportsCheck = [ "streamz" ]; + disabledTests = [ + # test_tcp_async fails on sandbox build + "test_tcp_async" + "test_tcp" + "test_partition_timeout" + # flaky + "test_from_iterable_backpressure" + ]; + disabledTestPaths = [ + # disable kafka tests + "streamz/tests/test_kafka.py" + ]; + meta = with lib; { description = "Pipelines to manage continuous streams of data"; homepage = "https://github.com/python-streamz/streamz"; From 44e7158618397ac3541bf71575364d51e2a90b50 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 31 Oct 2021 01:21:22 +0000 Subject: [PATCH 69/90] python3Packages.distributed: 2021.9.1 -> 2021.10.0 --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 049290081d62..b623fe302783 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "distributed"; - version = "2021.9.1"; + version = "2021.10.0"; disabled = pythonOlder "3.6"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "sha256-9N65ap2+9bBK0DCrkF3+1xuJPXmjaL1Xh7ISaLTtX/g="; + sha256 = "0kfq7lwv2n2wiws4v2rj36wx56jvkp2fl6zxg04p2lc3vcgha9za"; }; propagatedBuildInputs = [ From 13cd7982473b846611410de12d6fb0cf6f93fb41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 11 Nov 2021 14:58:15 +0100 Subject: [PATCH 70/90] rbw: remove extra string concatination --- pkgs/tools/security/rbw/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index 278e00903929..919fda9c67c5 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -74,7 +74,6 @@ rustPlatform.buildRustPackage rec { $out/bin/rbw gen-completions $shell > rbw.$shell installShellCompletion rbw.$shell done - '' + '' cp bin/git-credential-rbw $out/bin '' + lib.optionalString withFzf '' cp bin/rbw-fzf $out/bin From 9a3de685693caec5d4b42cf5121c24d200909217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 11 Nov 2021 14:59:28 +0100 Subject: [PATCH 71/90] python39Packages.swspotify: put patching in proper phase --- pkgs/development/python-modules/swspotify/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/swspotify/default.nix b/pkgs/development/python-modules/swspotify/default.nix index 7778c1225558..85cd2ed7c168 100644 --- a/pkgs/development/python-modules/swspotify/default.nix +++ b/pkgs/development/python-modules/swspotify/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { requests flask flask-cors dbus-python ]; - preConfigure = '' + postPatch = '' substituteInPlace setup.py \ --replace 'flask==2.0.1' 'flask' ''; From 4cb7014e1401c6c2dea0924ddc43910e7e522751 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Thu, 11 Nov 2021 09:00:19 -0500 Subject: [PATCH 72/90] giflib: fix static build (#144919) Co-authored-by: Dmitry Bogatov Co-authored-by: Sandro --- pkgs/development/libraries/giflib/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index 9eaf7b933d43..c86b706e13c8 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2, fixDarwinDylibNames }: +{ lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2, fixDarwinDylibNames, pkgsStatic }: stdenv.mkDerivation rec { name = "giflib-5.2.1"; @@ -19,12 +19,21 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile \ --replace 'PREFIX = /usr/local' 'PREFIX = ${builtins.placeholder "out"}' + '' + # Upstream build system does not support NOT building shared libraries. + + lib.optionalString stdenv.hostPlatform.isStatic '' + sed -i '/all:/ s/libgif.so//' Makefile + sed -i '/all:/ s/libutil.so//' Makefile + sed -i '/-m 755 libgif.so/ d' Makefile + sed -i '/ln -sf libgif.so/ d' Makefile ''; nativeBuildInputs = lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ]; + passthru.tests.static = pkgsStatic.giflib; + meta = { description = "A library for reading and writing gif images"; platforms = lib.platforms.unix; From 0aa2edcd9e1b4a0d750016d911a20994617507ba Mon Sep 17 00:00:00 2001 From: marius851000 Date: Thu, 11 Nov 2021 15:00:32 +0100 Subject: [PATCH 73/90] portmod: 2.0.3 -> 2.1.0 (#144847) Co-authored-by: Sandro --- pkgs/games/portmod/default.nix | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/games/portmod/default.nix b/pkgs/games/portmod/default.nix index b677c63defeb..27e00a746486 100644 --- a/pkgs/games/portmod/default.nix +++ b/pkgs/games/portmod/default.nix @@ -1,22 +1,22 @@ -{ lib, callPackage, python3Packages, fetchFromGitLab, cacert, - rustPlatform, bubblewrap, git, perlPackages, imagemagick, fetchurl, fetchzip, - jre, makeWrapper, tr-patcher, tes3cmd, fetchpatch }: +{ lib, callPackage, python3Packages, fetchFromGitLab, cacert +, rustPlatform, bubblewrap, git, perlPackages, imagemagick, fetchurl, fetchzip +, jre, makeWrapper, tr-patcher, tes3cmd, openmw }: let - version = "2.0.3"; + version = "2.1.0"; src = fetchFromGitLab { owner = "portmod"; repo = "Portmod"; rev = "v${version}"; - sha256 = "sha256-vMdyaI1Ps7bFoRvwdVNVG9vPFEiGb7CPvKEWfxiM128="; + sha256 = "sha256-b/ENApFovMPNUMbJhwY+TZCnSzpr1e/IKJ/5XAGTQjE="; }; portmod-rust = rustPlatform.buildRustPackage rec { inherit src version; pname = "portmod-rust"; - cargoHash = "sha256-tAghZmlg34jHr8gtNgL3MQ8EI7K6/TfDcTbBjxdWLr0="; + cargoHash = "sha256-3EfMMpSWSYsB3nXaoGGDuKQ9duyCKzbrT6oeATnzqLE="; nativeBuildInputs = [ python3Packages.python ]; @@ -30,6 +30,7 @@ let tr-patcher tes3cmd imagemagick + openmw ]; in @@ -47,15 +48,6 @@ python3Packages.buildPythonApplication rec { --replace "RustExtension(\"portmodlib.portmod\", binding=Binding.PyO3, strip=True)" "" ''; - patches = [ - (fetchpatch { - # fix error when symlinks are present in the path (https://gitlab.com/portmod/portmod/-/merge_requests/393) - # happen with ~/.nix-profile - url = "https://gitlab.com/portmod/portmod/-/merge_requests/393.patch"; - sha256 = "sha256-XHifwD/Nh7UiMZdvSNudVF7qpBOpjGTKSr4VVdJqUdA="; - }) - ]; - propagatedBuildInputs = with python3Packages; [ setuptools-scm setuptools From 8437f3acaf0f10a3aa8171cb7ed5b3a3740d9ab9 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 11 Nov 2021 09:05:34 -0500 Subject: [PATCH 74/90] ouch: don't use vendored sources --- pkgs/tools/compression/ouch/default.nix | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/ouch/default.nix b/pkgs/tools/compression/ouch/default.nix index fc2e2642cf8d..c9ffaef4b76c 100644 --- a/pkgs/tools/compression/ouch/default.nix +++ b/pkgs/tools/compression/ouch/default.nix @@ -1,4 +1,14 @@ -{ lib, rustPlatform, fetchFromGitHub, help2man, installShellFiles }: +{ lib +, rustPlatform +, fetchFromGitHub +, help2man +, installShellFiles +, pkg-config +, bzip2 +, xz +, zlib +, zstd +}: rustPlatform.buildRustPackage rec { pname = "ouch"; @@ -13,7 +23,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-jEprWtIl5LihD9fOMYHGGlk0+h4woUlwUWNfSkd2t10="; - nativeBuildInputs = [ help2man installShellFiles ]; + nativeBuildInputs = [ help2man installShellFiles pkg-config ]; + + buildInputs = [ bzip2 xz zlib zstd ]; + + cargoBuildFlags = [ "--features" "zstd/pkg-config" ]; + + cargoTestFlags = cargoBuildFlags; postInstall = '' help2man $out/bin/ouch > ouch.1 From 36e16d6979bec9ab3458b88a1a8804a975dadc8d Mon Sep 17 00:00:00 2001 From: marius david Date: Tue, 9 Nov 2021 20:56:25 +0100 Subject: [PATCH 75/90] openmw: 0.46 -> 0.47 --- pkgs/games/openmw/default.nix | 45 +++++++++++++++++++++++++---------- pkgs/games/openmw/tes3mp.nix | 9 ++++++- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index cfde63ac7264..edc8147a2b77 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -13,29 +13,46 @@ , unshield , openal , libXt +, lz4 +, recastnavigation }: let - openscenegraph_ = openscenegraph.overrideDerivation (self: { + openscenegraph_openmw = (openscenegraph.override { colladaSupport = true; }) + .overrideDerivation (self: { + src = fetchFromGitHub { + owner = "OpenMW"; + repo = "osg"; + rev = "bbe61c3bc510a4f5bb4aea21cce506519c2d24e6"; + sha256 = "sha256-t3smLqstp7wWfi9HXJoBCek+3acqt/ySBYF8RJOG6Mo="; + }; + }); + + bullet_openmw = bullet.overrideDerivation (old: rec { + version = "3.17"; src = fetchFromGitHub { - owner = "OpenMW"; - repo = "osg"; - # commit does not exist on any branch on the target repository - rev = "1556cd7966ebc1c80b6626988d2b25fb43a744cf"; - sha256 = "0d74hijzmj82nx3jkv5qmr3pkgvplra0b8fbjx1y3vmzxamb0axd"; + owner = "bulletphysics"; + repo = "bullet3"; + rev = version; + sha256 = "sha256-uQ4X8F8nmagbcFh0KexrmnhHIXFSB3A1CCnjPVeHL3Q="; }; + patches = []; + cmakeFlags = (old.cmakeFlags or []) ++ [ + "-DUSE_DOUBLE_PRECISION=ON" + "-DBULLET2_MULTITHREADING=ON" + ]; }); in mkDerivation rec { - version = "0.46.0"; pname = "openmw"; + version = "0.47.0"; src = fetchFromGitHub { owner = "OpenMW"; repo = "openmw"; rev = "${pname}-${version}"; - sha256 = "0rm32zsmxvr6b0jjihfj543skhicbw5kg6shjx312clhlm035w2x"; + sha256 = "sha256-Xq9hDUTCQr79Zzjk0CsiXclVTHK6nrSowukIQqVdrKY="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; @@ -43,26 +60,28 @@ mkDerivation rec { buildInputs = [ SDL2 boost - bullet + bullet_openmw ffmpeg libXt mygui openal - openscenegraph_ + openscenegraph_openmw unshield + lz4 + recastnavigation ]; cmakeFlags = [ - "-DDESIRED_QT_VERSION:INT=5" # as of 0.46, openmw is broken with GLVND "-DOpenGL_GL_PREFERENCE=LEGACY" + "-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=1" ]; meta = with lib; { description = "An unofficial open source engine reimplementation of the game Morrowind"; - homepage = "http://openmw.org"; + homepage = "https://openmw.org"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar marius851000 ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 72b698ceb730..37ad603d7cf5 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -9,6 +9,7 @@ , symlinkJoin , mygui , crudini +, bullet }: # revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy @@ -70,7 +71,8 @@ let nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ]; - buildInputs = oldAttrs.buildInputs ++ [ luajit ]; + buildInputs = (builtins.map (x: if x.pname or "" == "bullet" then bullet else x) oldAttrs.buildInputs) + ++ [ luajit ]; cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DBUILD_OPENCS=OFF" @@ -79,6 +81,11 @@ let "-DRakNet_LIBRARY_DEBUG=${raknet}/lib/libRakNetLibStatic.a" ]; + prePatch = '' + substituteInPlace components/process/processinvoker.cpp \ + --replace "\"./\"" "\"$out/bin/\"" + ''; + # https://github.com/TES3MP/openmw-tes3mp/issues/552 patches = [ ./tes3mp.patch ]; From e3bc478689b49a9a830bb0cd0f30e473dd02065c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Nov 2021 15:34:42 +0100 Subject: [PATCH 76/90] python3Packages.cirq-rigetti: relax certifi constraint --- pkgs/development/python-modules/cirq-rigetti/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/cirq-rigetti/default.nix b/pkgs/development/python-modules/cirq-rigetti/default.nix index 8717b09a49ce..dbd93fdfa2fc 100644 --- a/pkgs/development/python-modules/cirq-rigetti/default.nix +++ b/pkgs/development/python-modules/cirq-rigetti/default.nix @@ -34,6 +34,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ --replace "attrs~=20.3.0" "attrs" \ + --replace "certifi~=2021.5.30" "certifi" \ --replace "h11~=0.9.0" "h11" \ --replace "httpcore~=0.11.1" "httpcore" \ --replace "httpx~=0.15.5" "httpx" \ From f21e29d83b4bad7ec3a2a4d683548ec5935f7828 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 10 Nov 2021 22:34:03 +0100 Subject: [PATCH 77/90] youtube-dl: fix youtube.com download throttling --- pkgs/tools/misc/youtube-dl/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 680000b33713..20869ac4d792 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage +{ lib, fetchurl, fetchpatch, buildPythonPackage , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the @@ -25,6 +25,20 @@ buildPythonPackage rec { sha256 = "1hqan9h55x9gfdakw554vic68w9gpvhblchwxlw265zxp56hxjrw"; }; + patches = [ + # Fixes throttling on youtube.com. Without the patch downloads are capped at + # about 80KiB/s. See, e.g., + # + # https://github.com/ytdl-org/youtube-dl/issues/29326 + # + # The patch comes from PR https://github.com/ytdl-org/youtube-dl/pull/30188 + (fetchpatch { + name = "fix-youtube-dl-speed.patch"; + url = "https://github.com/ytdl-org/youtube-dl/pull/30188.patch"; + sha256 = "15liban37ina2y4bnykfdywdy4rbkfff2r6vd0kqn2k7rfkcczyz"; + }) + ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; buildInputs = [ zip ] ++ lib.optional generateManPage pandoc; propagatedBuildInputs = lib.optional hlsEncryptedSupport pycryptodome; From 49d03d07bec8104c69b51f16eea2d9423c07d039 Mon Sep 17 00:00:00 2001 From: x10an14 Date: Thu, 11 Nov 2021 16:23:02 +0100 Subject: [PATCH 78/90] vimPlugins.vim-fzf-coauthorship: init at 2021-07-14 (#145146) Co-authored-by: Sandro --- pkgs/misc/vim-plugins/generated.nix | 36 +++++++++++++++++--------- pkgs/misc/vim-plugins/overrides.nix | 4 +++ pkgs/misc/vim-plugins/vim-plugin-names | 3 ++- 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 6bb4eba7fb4f..1a3461ad8039 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2938,18 +2938,6 @@ final: prev: meta.homepage = "https://github.com/cohama/lexima.vim/"; }; - lingua-franca-vim = buildVimPluginFrom2Nix { - pname = "lingua-franca"; - version = "2021-9-5"; - src = fetchFromGitHub { - owner = "lf-lang"; - repo = "lingua-franca.vim"; - rev = "439b92a13744ee21cb3cd9c399e179efbcaa2967"; - sha256 = "sha256-Bf2MabUe3fy0meL6zIYgal/yFxtLKsg3b/BUI/AVlrM="; - }; - meta.homepage = "https://github.com/lf-lang/lingua-franca.vim"; - }; - lf-vim = buildVimPluginFrom2Nix { pname = "lf.vim"; version = "2021-02-18"; @@ -3058,6 +3046,18 @@ final: prev: meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; + lingua-franca-vim = buildVimPluginFrom2Nix { + pname = "lingua-franca.vim"; + version = "2021-09-05"; + src = fetchFromGitHub { + owner = "lf-lang"; + repo = "lingua-franca.vim"; + rev = "439b92a13744ee21cb3cd9c399e179efbcaa2967"; + sha256 = "1cwn2pq26m7hdwvwhajb3cbz4pva423cryp2k6sgrp8ynmlqrz85"; + }; + meta.homepage = "https://github.com/lf-lang/lingua-franca.vim/"; + }; + lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; version = "2021-11-03"; @@ -7780,6 +7780,18 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; + vim-fzf-coauthorship = buildVimPluginFrom2Nix { + pname = "vim-fzf-coauthorship"; + version = "2021-07-14"; + src = fetchFromGitHub { + owner = "maxjacobson"; + repo = "vim-fzf-coauthorship"; + rev = "c5df55743a274a2c2d6370008f199176dabae0bd"; + sha256 = "0v52w9jiyg0q6fmsh0dq8gd6m48vhhj2fy95v7lvqyr7pnr1wqaa"; + }; + meta.homepage = "https://github.com/maxjacobson/vim-fzf-coauthorship/"; + }; + vim-gh-line = buildVimPluginFrom2Nix { pname = "vim-gh-line"; version = "2021-03-25"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index af749a004f4c..d9a0adcdbb18 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -776,6 +776,10 @@ self: super: { ]; }); + vim-fzf-coauthorship = super.vim-fzf-coauthorship.overrideAttrs (old: { + dependencies = with self; [ fzf-vim ]; + }); + # change the go_bin_path to point to a path in the nix store. See the code in # fatih/vim-go here # https://github.com/fatih/vim-go/blob/155836d47052ea9c9bac81ba3e937f6f22c8e384/autoload/go/path.vim#L154-L159 diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 0438506633f7..383398444568 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -381,7 +381,7 @@ ledger/vim-ledger lepture/vim-jinja lervag/vimtex lewis6991/gitsigns.nvim@main -lf-lang/lingua-franca.vim +lf-lang/lingua-franca.vim@main lfe-support/vim-lfe lfilho/cosco.vim lifepillar/vim-gruvbox8 @@ -439,6 +439,7 @@ mattn/webapi-vim matze/vim-move max397574/better-escape.nvim maximbaz/lightline-ale +maxjacobson/vim-fzf-coauthorship MaxMEllon/vim-jsx-pretty mbbill/undotree mboughaba/i3config.vim From 1cc0429a8823b938dd2e015fca2908a4c1577b02 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 Nov 2021 16:34:33 +0100 Subject: [PATCH 79/90] python3Packages.pyaftership: 21.1.0 -> 21.11.0 --- .../python-modules/pyaftership/default.nix | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyaftership/default.nix b/pkgs/development/python-modules/pyaftership/default.nix index 6253d9511183..c0b941e849d1 100644 --- a/pkgs/development/python-modules/pyaftership/default.nix +++ b/pkgs/development/python-modules/pyaftership/default.nix @@ -1,9 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy3k +, pythonOlder , aiohttp -, async-timeout , aresponses , pytest-asyncio , pytestCheckHook @@ -11,21 +10,38 @@ buildPythonPackage rec { pname = "pyaftership"; - version = "21.1.0"; + version = "21.11.0"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "0jyzgwaijkp80whi58a0hgjzmnlczmd9vwn11z2m0j01kbdwznn5"; + sha256 = "sha256-SN7fvI/+VHYn2eYQe5wp6lEZ73YeZbsiPjDiq/Ibk3Q="; }; - propagatedBuildInputs = [ aiohttp async-timeout ]; + propagatedBuildInputs = [ + aiohttp + ]; - checkInputs = [ pytestCheckHook aresponses pytest-asyncio ]; - pythonImportsCheck = [ "pyaftership" ]; + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + # Upstream is releasing with the help of a CI to PyPI, GitHub releases + # are not in their focus + substituteInPlace setup.py \ + --replace 'version="main",' 'version="${version}",' + ''; + + pythonImportsCheck = [ + "pyaftership" + ]; meta = with lib; { description = "Python wrapper package for the AfterShip API"; From dd3c8d2262839d153e941456ee343d5ed2227396 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 11 Nov 2021 10:52:22 -0500 Subject: [PATCH 80/90] vimPlugins: fix update.py --- pkgs/misc/vim-plugins/update-shell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/update-shell.nix b/pkgs/misc/vim-plugins/update-shell.nix index b26620677039..18b5b1a37c5f 100644 --- a/pkgs/misc/vim-plugins/update-shell.nix +++ b/pkgs/misc/vim-plugins/update-shell.nix @@ -7,7 +7,7 @@ mkShell { packages = [ bash pyEnv - nix + nix_2_3 nix-prefetch-scripts ]; } From 882d9ee7131183455d156a2044d100b7ca8c8afe Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 11 Nov 2021 10:36:00 -0500 Subject: [PATCH 81/90] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 402 ++++++++++++++-------------- 1 file changed, 201 insertions(+), 201 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 1a3461ad8039..2324b57cfe0d 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-11-04"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "f37cd1fd4fc17173a98649d8a0b2f37ce7ba61cf"; - sha256 = "17p8bbqqsjw17b50p8pxrv30mf8n6495gwzvlfpj51yz2vvk66wv"; + rev = "8b3b16d71c4c683da6f3ca39662d207a3e894901"; + sha256 = "1mdxgiin61630fimxm2l0zcr30br4q2ipp84l3iqxjbs0fqg11s5"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -113,12 +113,12 @@ final: prev: ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2021-10-07"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "c84f8bb203c49d9da28e4ea7a32d951ccde1d40f"; - sha256 = "1ii58rvc8mvv33kbfnn7b66mpf08hn3vm2swjgaaw4dwvzffzi71"; + rev = "469e55b101d85ff82687d975349b356b362194a6"; + sha256 = "0z2iqb974drs0nc3cxk32z5xlbdl8bgbsc8564sz13ayqbdms4nk"; }; meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; @@ -461,12 +461,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-11-07"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "4b8ec3650ae41bb70128baacd68684ad212520de"; - sha256 = "1cjw98nfzz8a9za7cs2jy3i164qaj2fyrsfpg28f7f1b087n24p3"; + rev = "8bf4553d1000b2c9189f1893ac5c737b61572791"; + sha256 = "1jk795a6r8yzbjbyx121qn65njs4j3l947x3n937kygqpb7paflm"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -569,12 +569,12 @@ final: prev: cmp-buffer = buildVimPluginFrom2Nix { pname = "cmp-buffer"; - version = "2021-11-02"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-buffer"; - rev = "d1ca295ce584ec80763a6dc043080874b57ccffc"; - sha256 = "1s8b4wc7as9v8iqk03aagjpxkkghn0wzf15nj4ljpi3k3w5hxiw0"; + rev = "2d85e76c725a389b72067f86fc3c65f3868b9a59"; + sha256 = "0lvx58nchrl08jjp2gvyfrxkqdqnyi97zj86nnx184vnx8a5qcqh"; }; meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; }; @@ -629,12 +629,12 @@ final: prev: cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2021-10-17"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "accbe6d97548d8d3471c04d512d36fa61d0e4be8"; - sha256 = "1dqx6yrd60x9ncjnpja87wv5zgnij7qmzbyh5xfyslk67c0i6mwm"; + rev = "134117299ff9e34adde30a735cd8ca9cf8f3db81"; + sha256 = "1jnspl08ilz9ggkdddk0saxp3wzf05lll5msdfb4770q3bixddwc"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; @@ -677,12 +677,12 @@ final: prev: cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; - version = "2021-10-27"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-path"; - rev = "97661b00232a2fe145fe48e295875bc3299ed1f7"; - sha256 = "160jidd951qz1byjhbmd7ijp6hd37bdxbpg5wmzhprihwwpm628j"; + rev = "98ded32b9c4d95aa95af70b9979b767f39073f0e"; + sha256 = "1axx401sikh9ylji3d6cmgn4xsrzzfmlc1akfv1q709chv0a6r2h"; }; meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; @@ -725,24 +725,24 @@ final: prev: cmp-under-comparator = buildVimPluginFrom2Nix { pname = "cmp-under-comparator"; - version = "2021-10-22"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "cmp-under-comparator"; - rev = "69e88636a3f7a1630a6e1199b4039a5f110caf81"; - sha256 = "1af4l8vf66sz4vhyzlnkrg0hpwx2f7096g9rszralxq0nad1i12d"; + rev = "6857f10272c3cfe930cece2afa2406e1385bfef8"; + sha256 = "18kcxl9rg6qrg5wv6bb0hv0sjafspjhy57irf8gyaa66svwmgxmh"; }; meta.homepage = "https://github.com/lukas-reineke/cmp-under-comparator/"; }; cmp-vsnip = buildVimPluginFrom2Nix { pname = "cmp-vsnip"; - version = "2021-08-25"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-vsnip"; - rev = "1588c35bf8f637e8f5287477f31895781858f970"; - sha256 = "0q3z0f7d53cbqidx8qd3z48b46a83l5ay54iw525w22j1kki3aaw"; + rev = "0abfa1860f5e095a07c477da940cfcb0d273b700"; + sha256 = "1vhw2qx8284bskivc2jyijl93g1b1z9hzzbq2l9b4aw6r23frbgc"; }; meta.homepage = "https://github.com/hrsh7th/cmp-vsnip/"; }; @@ -797,12 +797,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-11-03"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "504f93819b47fd278e954608cace5c6530fdf397"; - sha256 = "1vfbciy34bvyfyl0vpyw7m2nj586cpvm2pin5c6iy5qmr92pgw60"; + rev = "9672c9cde3cce32720fafbdb65618d817b7022d8"; + sha256 = "1y35xqzd17c8cvlrqfa10lninql2xkkkgy40wl1bwfzl5awk9rm7"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1134,12 +1134,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2021-11-02"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "b3636f8199df988bedeb029f55a91cd17633523e"; - sha256 = "0jqbanfgh3l89i0frrnjyh47kyvhv3nfk3jgrswwzgn6b0w4cj6n"; + rev = "0b17e2bb069cb388ba22d156bbe1b3b3b3585312"; + sha256 = "1d7gssvw2sl1girj8svbdzlrhxsjgp9rkfkjrr2jd7p5ilhry27a"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1676,12 +1676,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-11-05"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "dac55912be3642a954ef0891b63a3f4cb1db5ce4"; - sha256 = "1w7a72jfwqf81rkwsnq70ar0hsnjjlkyxqxb3vg9yfcd5fki4920"; + rev = "f2c8e3d2a72f3763e3ea9c620a118e73e2146fb1"; + sha256 = "08v10j0hirqcj2r2fcw8b04v8bpwj1kp887pq8vs5f57ncqzl8x7"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1858,12 +1858,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2021-10-24"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "338c7190a535cc5cf82e9d7443964b2e4f8bf97f"; - sha256 = "1d74k0mgf8axsnksq5dh3zlangabwdx7vwfi05wx0q7vkxm545d4"; + rev = "dd365ec17e9ff1d87a5ce4ade8abf123ecfd007a"; + sha256 = "0s5gygvbz9ffnaxaikqj8mi16ip1gqxa19ijvjsjc8rv6jpkylsd"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1979,12 +1979,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-11-07"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "242c4a021d5655a5e86508f1cb3c08977d0acbe4"; - sha256 = "1rlq22ypl44ajjb5597braks6hn6qmf6ss0kh5vrvv6p9p1fy1dy"; + rev = "7d4a4c4e57b7aabb9e7d1f591c29e6d5e7e382e4"; + sha256 = "19z6yjdd7q9hydzx3bw2w8c573y0xjn9s7n780w65n34iirjbh7i"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2051,12 +2051,12 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2021-10-21"; + version = "2021-11-07"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "34bddd8a31441435f1d29eef0452576d12144da7"; - sha256 = "1ijqnqmdlm2f3jkjh68baif05lf27rww43vvndix2icypnd16vcp"; + rev = "19a6f405e4a6eb74788393390d945bd156d559b3"; + sha256 = "0nq9nfviyly136xhjzdvmhvj7flz44pl5as0npa4d13ng3gs451p"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; @@ -2171,12 +2171,12 @@ final: prev: git-worktree-nvim = buildVimPluginFrom2Nix { pname = "git-worktree.nvim"; - version = "2021-08-24"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "git-worktree.nvim"; - rev = "e562d8a3baa6c96d148944592a2d7c88f48927f2"; - sha256 = "1c78pjycvnkq28ar7bp0xiadyd3jml596hsw0fsxvbdwba4a7ikk"; + rev = "14d4be5f9db5c5cce7b4c1ee10c70d663c367373"; + sha256 = "11gzz2dc75b0sqkkxsiw9yramfwhcrv4vq39mxlzmxxzbzk11dv2"; }; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; @@ -2207,12 +2207,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2021-11-04"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "61a81b0c003de3e12555a5626d66fb6a060d8aca"; - sha256 = "0ya0vgwlmy2mpkgqhz0lyxh19iwilm5vwvk4c9ygsxwq3561vfcw"; + rev = "e6775fa32e4904cc8bbd098ba9807db9606e816e"; + sha256 = "1w7vq9jbw3lhd8i9wbf71q344235iwcigff7jrrh3fbcq6kk7m12"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2279,12 +2279,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2021-10-31"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "bde83cdac0c99a82c010c29f9e00ad488f9e035f"; - sha256 = "0vql6whiijfaglrkn0byrgkqm78rprhbbxajwh51iw80kqkm5ic0"; + rev = "b930629c018c6b30d42e8d271a32a37e0360c628"; + sha256 = "0mly30sqbs43xmkda04jzk4knxcv7f42sddm87ky6j8ii67147ys"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -2339,12 +2339,12 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2021-11-05"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "0eaf2c5f1e4c2e274b6983c5178d66522e312468"; - sha256 = "0yfal45w1lf02wpws8ha3rka7n9c694z7wjya9ilpnm6xg20d0y4"; + rev = "a25c5294013d58e4fde6b72d94a5f77e3330f0cc"; + sha256 = "0k4baphl8x6fy8hqidr7g8mw6w1cjhwsgjmsd9v72a9ikl4z22vq"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -2579,12 +2579,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2021-11-07"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "9dab64554c6249eb31a0bf3e689e0d36d6998fb8"; - sha256 = "0jva20qh2mc9vd12wfbw3ngvx2745vvmn0qkz9lnrk2xkwy31dby"; + rev = "bc8372815506066f3ca7885baca717cb986957be"; + sha256 = "0svhinr5qmhcskvakl71yykzxhm6m0ydymx7dp5w0jwsdcv9nnrx"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2784,12 +2784,12 @@ final: prev: kotlin-vim = buildVimPluginFrom2Nix { pname = "kotlin-vim"; - version = "2021-11-07"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "udalov"; repo = "kotlin-vim"; - rev = "e2fd6fbe98a85be28e75fe9c7cc341cfbba3ac23"; - sha256 = "1iv45znmija86jly2hm08s5bsi53kphdziwgknsz5l2va93vx34z"; + rev = "6fec676fe552cb30165dc8977dab9353c4c3ab26"; + sha256 = "08sz0fmlk4bzzkg5j0zbjd1dki1ykigar4rzyc05xfynvkcxh4fg"; }; meta.homepage = "https://github.com/udalov/kotlin-vim/"; }; @@ -2880,12 +2880,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2021-11-07"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "f0fca2a67d06949ee7550d1525aca50107c6a3b7"; - sha256 = "0yw9k6mdbjhzgcdr9z2gyazcz200v8c66vfxmk9z0lhr7jrvby1a"; + rev = "27a9bba67bc9114ba9a6f48686ac983f301dd4be"; + sha256 = "1vcd1i2w9vnkmlhan62s0raa8gigxpdyyzqvn2qqv1rifxzigpfw"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -2928,12 +2928,12 @@ final: prev: lexima-vim = buildVimPluginFrom2Nix { pname = "lexima.vim"; - version = "2021-08-12"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "6b716e2118d842a26620387f0845e57cfd69ffaf"; - sha256 = "1az40rjfyvwg9zkk822abrf0v0ccm29rp5290capirnfna5w71d6"; + rev = "99ece6758ec49b04de983873e4117a390121fbb8"; + sha256 = "00sjngkscry6ln9d94w9b2466d1y2prxivaxn8hqxpng1wyhhlay"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -3024,12 +3024,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2021-11-05"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "3f833700b1d39c6cdfd32b9be27078e8bc37fc2f"; - sha256 = "0w1zb8pz3bgn19lfvz3ig35vmn5d4m65cmrhhgcnyjgi7z83p05f"; + rev = "6429028c58a2a64916cb9132743e5301af460c1c"; + sha256 = "0qhx7axm5vg1xh5j2mg0x3l7154f4n55k28pajrak4yw7ws82232"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3180,24 +3180,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2021-11-05"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "3f5cdc51a08c437c7705e283eebd4cf9fbb18f80"; - sha256 = "15vvz7a89lj101gcpykws45kgsai5dqbcqnkflvx87ivcxs0iz97"; + rev = "df46c1e70a0aeb234aa9d2048d14f626a1cca317"; + sha256 = "0khkkicwcnrwpd9scdsggia916ws6hvpyx0gnszg43zq74q5h27q"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-11-06"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "bab7cc2c32fba00776d2f2fc4704bed4eee2d082"; - sha256 = "1z1a35rpil7f5yk0al7r7k1kxpvf4x9kzpsb4s0v0c6mh8zmc5aw"; + rev = "366fd76ea226bed11966cd8b1a229cba08fa4394"; + sha256 = "17jla5yvi0vzgi0himl8fyfmc8sl8xg1k5bzl58iq0d2ycmr08as"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3240,12 +3240,12 @@ final: prev: marks-nvim = buildVimPluginFrom2Nix { pname = "marks.nvim"; - version = "2021-10-31"; + version = "2021-11-07"; src = fetchFromGitHub { owner = "chentau"; repo = "marks.nvim"; - rev = "17e7f468d7128c4c2f6ccf334d136be5f712464d"; - sha256 = "1a4jm8wm0lqx16ic991xzvwqyys9cspj15bqnphw05gc2w14qz02"; + rev = "f43e349601b439b4b07bec1d996cfd70d48d09fb"; + sha256 = "0xnrklam85yva82ncfbpymhs8wa0g9vcks4dzdpvnj8f21la1f3d"; }; meta.homepage = "https://github.com/chentau/marks.nvim/"; }; @@ -3624,24 +3624,24 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2021-10-30"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "6b28df63eed20a57af131ba320646395c77a676c"; - sha256 = "1bcnlw2za6ig6hj0zcqbas6pphs2i6zgqyvf2cakk37pjdxc2gv1"; + rev = "f1b6cd506b72be0a2aaf529105320ec929683920"; + sha256 = "0idj1l5962vfzqhksifxi4qa8d2w8mnhdqa2z5wwpphjiparfqrg"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-11-02"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "85f2bdc31afb132c9603879bf3a7169a917eb949"; - sha256 = "1whcav7n49nrqvll1hdwr3bb25ls0ih7j49jwrjx1x4hpix2zrpl"; + rev = "807e4a795dc6c2383b281fc27bd1bc6c197d98cd"; + sha256 = "126kdn9dfvk0ggzh00439zwrq1jldnxvk0nsf7g371qkbbnc4qal"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3852,12 +3852,12 @@ final: prev: neuron-nvim = buildVimPluginFrom2Nix { pname = "neuron.nvim"; - version = "2021-10-18"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "oberblastmeister"; repo = "neuron.nvim"; - rev = "10b189437c3e080502ca14ed0e7bc041274e0610"; - sha256 = "11p6n33c642z6q89j2a71czffp3d3mzhp9mdygw2gadar9g4fvl8"; + rev = "a7280d4923f51c8af8cecc53aa06ed49cbbd412d"; + sha256 = "0qanc7r9z5ry3xxbvpv9xbmxnx0f8yj10fi887yhrcms7kj73al9"; }; meta.homepage = "https://github.com/oberblastmeister/neuron.nvim/"; }; @@ -3900,12 +3900,12 @@ final: prev: nim-vim = buildVimPluginFrom2Nix { pname = "nim.vim"; - version = "2020-10-16"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "zah"; repo = "nim.vim"; - rev = "7a8737a4532239c06116ebde0329d8156f3d3b55"; - sha256 = "05xhac416c8zsgqlchc80f7gbjxbyngi6cxziqagdhr6kccc73gi"; + rev = "a15714fea392b0f06ff2b282921a68c7033e39a2"; + sha256 = "1vf3af8b85rjsccvclkb6aw9zgkwfpxd43jgnkbx6wrsv9bfz034"; }; meta.homepage = "https://github.com/zah/nim.vim/"; }; @@ -3972,36 +3972,36 @@ final: prev: nterm-nvim = buildVimPluginFrom2Nix { pname = "nterm.nvim"; - version = "2021-11-05"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "jlesquembre"; repo = "nterm.nvim"; - rev = "992cb567250cbf59d1465eb7371f9c6c75a13fb0"; - sha256 = "0d7fww3bv8fcl4wy29laa2drlhr6a7b29xlcfm5mxxdyyaxa1f3c"; + rev = "14d16c83aa1d165724f7780f470c4dcde5addcb6"; + sha256 = "0y883fpjfk7lki8nfscxhfw0wr7xm1d22zgf52zqmc9pjznjz9my"; }; meta.homepage = "https://github.com/jlesquembre/nterm.nvim/"; }; nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2021-10-30"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "362585d6515805d4be4eb665cf8707759a92a254"; - sha256 = "0gzanzyn7fa0qmngrqzlflzzyjzqkn21nhwbgw48hd0x143p0fab"; + rev = "a07b754552008012f2d7d3602b7a233a29d92c66"; + sha256 = "19ffxpmq82f9qxbnb2lw2hvc9gqc1vfyvf553wpc439rpi98mxja"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2021-11-04"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "64b269b51c7490660dcb2008f59ae260f2cdbbe4"; - sha256 = "1vp5y8cd3ljhshg2hrisbgxxb1zz5xqqxldngv3ll98pd98f9yjy"; + rev = "2bf885dda0ecb669ef66d1c757287c98f6c16500"; + sha256 = "1303gpdr5yzxznx0djn5q09p1vibh15d0nmj1j6n2zqbjdx6bhfw"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4044,12 +4044,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-11-07"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "01f3a9f72fe36d4ca036d0e9c5cd6c506f4394ce"; - sha256 = "092f6kj5b3jd4y65kmh3z4vq844mvv21msjgmlr453b5gqnkqdwr"; + rev = "f4f1c9f27d8514885cd851b3ae0a648e1eb15a17"; + sha256 = "0ipb2pvkc28zp5pdb5ih5rcnzj4wkwg5i59lb3ll4cv0yj398kr9"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -4104,12 +4104,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2021-11-05"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "1774ff0f842146521c63707245d3de5db2bb3732"; - sha256 = "1gj21q15s61l6afxrvh49cvm7wn4b7chhsrs4355j7ldmsr88dk7"; + rev = "af06bd4b440c4da6b363ec2c3feb49bc0cda5510"; + sha256 = "0ckvm3kggnfqv4ngaxpl4zikbs2pwbqgy5x9fqzrdj2vydfm85wp"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -4236,12 +4236,12 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2021-11-05"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "74648310ffe95eba2054ce7a312d77d0b0cc1a32"; - sha256 = "1qa3fn2ianq1fiq6jvlvbvija36qf4i48gccvafwc23ap4fgsg0g"; + rev = "14653c92c93b2e00a8cc742ee109f510350afc2a"; + sha256 = "13i1pyd5ibmczyw3r2wrhrislkych994487iv5202zv0jn6jaglm"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; @@ -4308,24 +4308,24 @@ final: prev: nvim-lsp-ts-utils = buildVimPluginFrom2Nix { pname = "nvim-lsp-ts-utils"; - version = "2021-11-06"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "nvim-lsp-ts-utils"; - rev = "19d41dd70b3ee4e6fdd48c2a81c20a4b0c62a7b6"; - sha256 = "0ka575gcbgr78jgaa7zavfbm8jww1lpgypw8k7rjpzvbznnklxri"; + rev = "1af2922c3ab7f80654c09932c55bd5d70f13f1e3"; + sha256 = "1qcska723k2ajimmib7i57clhdbrbqlcp4b18capsrrnxsl92pq0"; }; meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-11-06"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "3a5d94df2d61992496d1fc986d2433b944584a8d"; - sha256 = "17sx8yzlx2ciqhwdhwq28zjpmbzfdzm5rsyjr31q10gqlj6l9kq6"; + rev = "edca6c107027111ed02abe17a231d1cf0d353adf"; + sha256 = "13abx9r8p9admskallw3y1dqia288xm6l3l6idshih6wbmkx2jk2"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4392,24 +4392,24 @@ final: prev: nvim-solarized-lua = buildVimPluginFrom2Nix { pname = "nvim-solarized-lua"; - version = "2021-10-23"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "ishan9299"; repo = "nvim-solarized-lua"; - rev = "39ed6d841a71de0fcc51d6665638e864e42116cb"; - sha256 = "11v8vxz3daj2sl13hgvd8cadh7h5kij5kg43km917an5k1cw293j"; + rev = "05433b58825e13465b82430f2cc7b0414df2ba6c"; + sha256 = "1w2n8zj17dj87xfbacz9kgkcws2cihnfa3640s6393gli20782kq"; }; meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/"; }; nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2021-11-01"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-spectre"; - rev = "8d5d29ac0d4ad1b21ed986cbbdb160193aba3d5f"; - sha256 = "0yiv3j153pg2x1cdwrl8fq2wbvapxbixxqz8z14x5bdy5rn7i4jf"; + rev = "9502f162a43d18d03f6d11e2152aee39b1ed5adb"; + sha256 = "1czj2jbls3ci35mbvvzb7x2zzh3aw2rz42bvfx45ibpw6iabdgky"; }; meta.homepage = "https://github.com/windwp/nvim-spectre/"; }; @@ -4500,24 +4500,24 @@ final: prev: nvim-ts-context-commentstring = buildVimPluginFrom2Nix { pname = "nvim-ts-context-commentstring"; - version = "2021-11-03"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "159c5b9a2cdb8a8fe342078b7ac8139de76bad62"; - sha256 = "0h2dlln226jhvv8anybz4b70z698bfc0sdb5k2zhzya7k0lmlfcz"; + rev = "ce74852c36008b11dda451bfe6c2ed71c535152b"; + sha256 = "04hd5wg3f39sn4qc958fw9inmkaj18mkgvmwkxni4qnb2y8qs9pi"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-10-26"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "2943a62d787e8b0ffa4dfc685036b262335889d3"; - sha256 = "113h15h0n454qfq0jlfpgp4f0msvsqmjc0mnsxw726yabd5qqjvg"; + rev = "5cef624eb407449a313b63cdda66720e9860821f"; + sha256 = "0r39ahrk54smb9ngb4s11kxjncrsarclrdjvaazdi82260saxgb9"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -4560,12 +4560,12 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2021-08-31"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "haringsrob"; repo = "nvim_context_vt"; - rev = "df026a7186e33e20c4b8f98f8f94a5caecc345af"; - sha256 = "0lxkmld4rg3vzxbx23v3r3hxkgj572kngddvy4l83068gwmdr08m"; + rev = "8db258aeff84adee646afab970980c745286a1e6"; + sha256 = "0jbkms1alssp9399nhbzilqap0yji6sxpy207v3vmk1haf27cqz4"; }; meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; }; @@ -4632,12 +4632,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2021-11-02"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "2789a1a025b3511224bb35bd3b0bb014a674166c"; - sha256 = "0wgdsh8rni68llif9f0i9ckl1n75ig0gb4lczg4gdk4g5qxi4rwj"; + rev = "9015d8a1313b16cf3792830eb8d77553765adb80"; + sha256 = "19mhfr8ih2hp9jadgphwq0g576qsbnggiknv6ipkl60d8jrhxflk"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -4680,24 +4680,24 @@ final: prev: orgmode-nvim = buildVimPluginFrom2Nix { pname = "orgmode.nvim"; - version = "2021-10-29"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "orgmode.nvim"; - rev = "50d1a97b25d77f33d312b4775fbd68217d22c946"; - sha256 = "10rahp4yb6sjq8afrig0c0fi9fjvhcxqp3y9qclzz5bxp4skwv78"; + rev = "93779c1eed34da14ab8082933fb1e3d47869d07f"; + sha256 = "145460q9a9f4jp8l8pfqi5rf12vvz05g4jfd70h65i7i55l2v37j"; }; meta.homepage = "https://github.com/kristijanhusak/orgmode.nvim/"; }; package-info-nvim = buildVimPluginFrom2Nix { pname = "package-info.nvim"; - version = "2021-10-30"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "0572250a6b69f01416399f2f581aa87c17e03810"; - sha256 = "0z26i2h42vjsc5fkikfi6w7d7fnf6m3j5m7a73hi9rdbw389b2ay"; + rev = "037bedfa881d60f0ece93c31f31d04cf3ca29a87"; + sha256 = "0gflgccj0ymgv89paq9dp54f56g0wwz7m56sdfdycjii491q5hm4"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; @@ -4812,12 +4812,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2021-10-29"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "96e821e8001c21bc904d3c15aa96a70c11462c5f"; - sha256 = "0y05pwc4kbjqgj1zjjhvmrll3d53wz55zgqavxd4bvj2gwhvnd2k"; + rev = "b42e0cfe22ad3a0cac35cf14315e9dc22cea2ec9"; + sha256 = "09is80vcmnp0w42nahsqwliiyiyv64s9x459rl2dk4mnr7hgi7fm"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -5005,12 +5005,12 @@ final: prev: rainbow = buildVimPluginFrom2Nix { pname = "rainbow"; - version = "2021-10-25"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "luochen1990"; repo = "rainbow"; - rev = "54c79a24725af3a15d3aad20f70a56c7abbd46c3"; - sha256 = "1bd8nqlcyhxxf02p4a16gayqkdh1010b7mnlfvzy69iaf2xclyx5"; + rev = "f1cb0d3d4a4785428f7ccec9f0e69ad314d748d9"; + sha256 = "15227jrbhagbyvd56cq1byc32hwgbsh293r9fb96419pa3rm9j1l"; }; meta.homepage = "https://github.com/luochen1990/rainbow/"; }; @@ -5089,12 +5089,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2021-11-01"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "0a6af73a7353233842d3c3004f66cb99eb7a45d0"; - sha256 = "0dm09183c68vsvpf3y3grfif7bqiba0jyprf3cgjypy1y8qzinvn"; + rev = "c3fea5e8b377b07cd744579f8ca65e3f805ddaad"; + sha256 = "0rbn1mnyn9dhxv48qngs71n8pw25fmyaaffqgrk3qxfc1rxihf4a"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -5245,12 +5245,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2021-11-08"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "29116d254c8fa4138cdbeac2beb9dedac6b52dcd"; - sha256 = "0jdzkbj6p8d84w6hfpwcdc0qzdrwzp7gqdqxgwl6nwkwm10ahwgm"; + rev = "6b3ec7db13a9935d5d948fb0985707181e07979d"; + sha256 = "18inch8c1n9b835igw8brvmxh4c8pl9cq8qiv3v64fry2pv59mqd"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -5317,12 +5317,12 @@ final: prev: seoul256-vim = buildVimPluginFrom2Nix { pname = "seoul256.vim"; - version = "2020-06-21"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "junegunn"; repo = "seoul256.vim"; - rev = "24ed467ca6ef9ce7ede56c9ffb1c6b30cd0ee906"; - sha256 = "0ihs5nxdyx3jr1n96l2yx4b5gc48x7qbyxv6dc53ihw2vpn783fx"; + rev = "538742074ec5cac2e84c383f02b85b368d35df9c"; + sha256 = "0pcgx5ng3snfvcspfi62qbsg5pd10y79r3j21cn1g5rr5ck7zl7a"; }; meta.homepage = "https://github.com/junegunn/seoul256.vim/"; }; @@ -5462,12 +5462,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-11-05"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "c60000ce708e8cbcf833a4e82306169969174c7a"; - sha256 = "1iiamab2ym59l6mpm9v4jli9gdi9lmj73w5j7ag5f0n3bwdxpkyb"; + rev = "30dd4ae6f844ab0f53ba93eea61068f87886eb03"; + sha256 = "0hwcar6c6n3fvli9pmx1ycvk4128f47hl07c7y7hxzy2rks7s3j8"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -5619,12 +5619,12 @@ final: prev: stabilize-nvim = buildVimPluginFrom2Nix { pname = "stabilize.nvim"; - version = "2021-11-07"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "stabilize.nvim"; - rev = "14c809b63c2a6fb87493dcab22ceba64ed5a1428"; - sha256 = "1xr2vy264fv0dk0rbs3q0cma4whrsdwxw8iqvfr2xa1mc1w5agpy"; + rev = "fd74d2a9d2a384a530eba3a9771a5396b4ddad26"; + sha256 = "190mf9w344db5civ122l7zdr63l811qcqf7shh89zx4qfrsllf43"; }; meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/"; }; @@ -5727,12 +5727,12 @@ final: prev: syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2021-10-18"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "d086f49d389e1c2d58211b1f92cf20c9f63dc325"; - sha256 = "0cnd2m1dnx69657dpckiiy1slx2fpnpggm3qs0nzm5rm3qpzx185"; + rev = "2c4b33f6e6679fb5f3824d9cd38d4813c71a19a3"; + sha256 = "18lb4rs9zrgn35b2x6b7pycd3h64virkadlidcy3xhzhsynlvwgr"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -5993,12 +5993,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2021-11-07"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "458382836683140c1b4d8d74b80379fe4636bc40"; - sha256 = "0n9gpsd65fr0fn3cwfr73byjl3d0dr1yvwg0yhvh1iwhn6bg3nrv"; + rev = "f3ef5920725d719ed23195a457a86015826d3e1d"; + sha256 = "1dhczp84lhsz1ikqprg552wqi0hncigvhfb726iz01cr9y25b8mg"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6630,12 +6630,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-11-03"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "17f7dff748c188eb511ff831c4ea1803418f2b42"; - sha256 = "1n2j81aw5iwv080apw8d463h4yqm0yhqsrhvizfb7zz8j30nbhq0"; + rev = "47bf6b1716d599fa19756ce094309a3d551fac73"; + sha256 = "1c2sqkyd0zha9pchh1lbyww7v281rr488ff5b1c2rkc6inya9lcd"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -6762,12 +6762,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-10-07"; + version = "2021-11-07"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "d8a6962524ed4afbf7c92e7678bacf91d66f097d"; - sha256 = "0sscvgj6fwa9yy2p999rr7chp1xgg8japzwpfwwnzw77x3ikv3cp"; + rev = "bb11f30377985e45e2eecef570856d42dbabb8b0"; + sha256 = "1lx5lrb0hjijvwngvgsgchww70c1bgqf5qxj8lhvk11dvxn3k087"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -6954,12 +6954,12 @@ final: prev: vim-clang-format = buildVimPluginFrom2Nix { pname = "vim-clang-format"; - version = "2019-05-15"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "rhysd"; repo = "vim-clang-format"; - rev = "95593b67723f23979cd7344ecfd049f2f917830f"; - sha256 = "0n0k13k63l8n0ixs4zrhlz923apvdp2mldadxqlhmvsvncmlqmpn"; + rev = "261d02c305f3ed361c39e3b9ca5d66b5b45df4c7"; + sha256 = "1lbfxb91s3951j3zhpmc7jj8xnsd2qcrd6d5xm35xarcsxwl5rvh"; }; meta.homepage = "https://github.com/rhysd/vim-clang-format/"; }; @@ -7770,12 +7770,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-11-02"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "a6b823b8d0a8959e81876fd4857ba822495c028a"; - sha256 = "1aiz0lmjmjvcw67aanc06ba131fvszck0y7zg4kl625wlf6ahdkx"; + rev = "2e4ee0b5d6e61c6b3bc48e844343f89615dfc6e0"; + sha256 = "0ibks13hicpv5syk6lgrzjfbacwxfp02cmp23ry8wjm2dkzmv81s"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7914,12 +7914,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-11-07"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "d2824f99487118912b3e6ad5baec09bae8d337e6"; - sha256 = "04kjl2x46ckazixwg43xf6n2m3f5rbgqbaskmwb5jsi6741vhkgi"; + rev = "96b74acc8747d667247fd8d30eb15f6b44778f6f"; + sha256 = "1cd5kzjsylg5if1fqs7ll5s47jmmbhpw3dxn1k7cyf9wkkmy0di8"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -8323,12 +8323,12 @@ final: prev: vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2021-08-21"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "54a4b02edef78509621d180794df0c6924e48b3b"; - sha256 = "08hi6r1cspkklir9qa6x4h4a3zs404hvcwsspylysv7asnv8jncf"; + rev = "19aec7d63eda429d056586d9bcc98f61f860c668"; + sha256 = "055f58342ai117gq0021zwhv8ck5sca8bxrqqixbv5cjywck0r17"; }; meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; @@ -8492,12 +8492,12 @@ final: prev: vim-lawrencium = buildVimPluginFrom2Nix { pname = "vim-lawrencium"; - version = "2020-10-10"; + version = "2021-11-08"; src = fetchFromGitHub { owner = "ludovicchabant"; repo = "vim-lawrencium"; - rev = "4592f24a50386e02870fa8d508cc7ba8454dc102"; - sha256 = "158hslq4chlqr9mhdpcrbxnygjk4j1pc2caqc3zrwqh9qdk8mvha"; + rev = "eee52c9da9a58c1f079adb4a3134a0620bc6e945"; + sha256 = "12431h344dhjswg0pm8nvfszy8hp8b61nm0r8gsry9a6w1j1a86b"; }; meta.homepage = "https://github.com/ludovicchabant/vim-lawrencium/"; }; @@ -8865,12 +8865,12 @@ final: prev: vim-mundo = buildVimPluginFrom2Nix { pname = "vim-mundo"; - version = "2021-07-13"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "simnalamburt"; repo = "vim-mundo"; - rev = "8b4bccebf7a16938c77073983d643ba22aa04079"; - sha256 = "11livwi2pvnrxj7mildh46a6rli6hibpbffc9a5q6vxkvn9s6v29"; + rev = "e193f185bad3aa58446e771f8f2739abf11d3262"; + sha256 = "1q2j88rcg0slvm2bfdri4fy42h5a2md9bbqsspb3kzx5yrhgawhp"; }; meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; @@ -10150,12 +10150,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2021-10-17"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "2052bd926c37b5c828dd07c47ac676102ca34a0e"; - sha256 = "1lyx57jryxx5r9s60hg3v6y0kx5p2qc408nl8zhffqhzzmxvkgp9"; + rev = "8d942aa3b0eea1d53cccd1ee87a241b651f485ee"; + sha256 = "03s5m19j19xjnwnfknfff4nj3wpzb11fbkf95bif1rrms9v8kw2i"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -10666,12 +10666,12 @@ final: prev: vim_current_word = buildVimPluginFrom2Nix { pname = "vim_current_word"; - version = "2021-09-26"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "dominikduda"; repo = "vim_current_word"; - rev = "5cfee50ec35d011478c4ec9805a0e5d9a92f09ea"; - sha256 = "0l543hg5wyrbqykbm8vvhcb8wq9gwkc8y4nq9f7qy5a2qssvvd31"; + rev = "961d54dd53a1da7a9402dc92098a8a8c75d79ac6"; + sha256 = "1qa8pnr8fjxy0d3kf4vhjzwqlj1yszj2r21phmw4f3yl1hl72hc0"; }; meta.homepage = "https://github.com/dominikduda/vim_current_word/"; }; @@ -10690,12 +10690,12 @@ final: prev: vimade = buildVimPluginFrom2Nix { pname = "vimade"; - version = "2021-10-29"; + version = "2021-11-09"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "934d5c92e5b3439fb2eb2a8d8e6e50c4bf02d740"; - sha256 = "0pmmhap4npfg191dkzia1lajvp2l583bf2x2f2n33qlwbq2nh4nk"; + rev = "25ac9e6e3b8f127ab81dc996c69bb7a2c8f26329"; + sha256 = "1nkqmxvamziyavpfqlpn24wqzmrjwzb0s53avkw06h437mpzxzgy"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; }; @@ -10823,12 +10823,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-11-06"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "8bfcb533b90447b8f70c4c0de712bd966059e416"; - sha256 = "1fls9g2bw5pr7y401c63ixi99d7cvm7nxawvpysayz36iyqajrwr"; + rev = "c63adb6958458b62a7b9c0e4156d11a5da5f1a9f"; + sha256 = "07q4wmckz2a1x2l11pa1m5dqbk8wz0slk28p7wcapwfn5lxf48jq"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; From e757f1fc7154f964c470f741a3e4b335adfab26e Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 11 Nov 2021 10:36:35 -0500 Subject: [PATCH 82/90] vimPlugins.cmp-cmdline: init at 2021-11-08 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 2324b57cfe0d..28bd6bb73fe1 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -591,6 +591,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-calc/"; }; + cmp-cmdline = buildVimPluginFrom2Nix { + pname = "cmp-cmdline"; + version = "2021-11-08"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-cmdline"; + rev = "0ca73c3a50b72c2ca168d8904b39aba34d0c4227"; + sha256 = "1777rv9mh3bar8lp5i4af7kip5j3s4ib8a83b67clga8pcdjla4d"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; + }; + cmp-conjure = buildVimPluginFrom2Nix { pname = "cmp-conjure"; version = "2021-10-09"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 383398444568..e7e00b66eacd 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -228,6 +228,7 @@ honza/vim-snippets hotwatermorning/auto-git-diff hrsh7th/cmp-buffer@main hrsh7th/cmp-calc@main +hrsh7th/cmp-cmdline@main hrsh7th/cmp-emoji@main hrsh7th/cmp-nvim-lsp@main hrsh7th/cmp-nvim-lua@main @@ -885,8 +886,8 @@ vmchale/ats-vim vmchale/dhall-vim vn-ki/coc-clap voldikss/vim-floaterm -VundleVim/Vundle.vim vuki656/package-info.nvim +VundleVim/Vundle.vim w0ng/vim-hybrid wakatime/vim-wakatime wannesm/wmgraphviz.vim From ed7252ca24d62acb2b71aa30b7b6bdc8bfb021f2 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 11 Nov 2021 10:37:10 -0500 Subject: [PATCH 83/90] vimPlugins.cmp-nvim-lsp-document-symbol: init at 2021-10-28 --- 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 28bd6bb73fe1..68c4aa0bb06c 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -651,6 +651,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; + cmp-nvim-lsp-document-symbol = buildVimPluginFrom2Nix { + pname = "cmp-nvim-lsp-document-symbol"; + version = "2021-10-28"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-nvim-lsp-document-symbol"; + rev = "29d12e55cf49ee07b829114ad39b161cad2544ab"; + sha256 = "0w4m34467j3cg4dj69r12115p5k1i2lbjzmwx5hmd5x6xzb5qycb"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/"; + }; + cmp-nvim-lua = buildVimPluginFrom2Nix { pname = "cmp-nvim-lua"; version = "2021-10-11"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index e7e00b66eacd..01e33cc4d4fe 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -230,6 +230,7 @@ hrsh7th/cmp-buffer@main hrsh7th/cmp-calc@main hrsh7th/cmp-cmdline@main hrsh7th/cmp-emoji@main +hrsh7th/cmp-nvim-lsp-document-symbol@main hrsh7th/cmp-nvim-lsp@main hrsh7th/cmp-nvim-lua@main hrsh7th/cmp-omni@main From d83603ec2c8b326e96aea85ccbe01b54edc0adbd Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 11 Nov 2021 10:37:39 -0500 Subject: [PATCH 84/90] vimPlugins.ron-vim: init at 2020-08-22 --- 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 68c4aa0bb06c..a2bbd5299c05 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -5195,6 +5195,18 @@ final: prev: meta.homepage = "https://github.com/mfukar/robotframework-vim/"; }; + ron-vim = buildVimPluginFrom2Nix { + pname = "ron.vim"; + version = "2020-08-22"; + src = fetchFromGitHub { + owner = "ron-rs"; + repo = "ron.vim"; + rev = "04004b3395d219f95a533c4badd5ba831b7b7c07"; + sha256 = "1xlr8slwcr6b9p33awf8xzdp04myv6dcsxwi50val4vzvzcgyrcl"; + }; + meta.homepage = "https://github.com/ron-rs/ron.vim/"; + }; + rspec-vim = buildVimPluginFrom2Nix { pname = "rspec.vim"; version = "2020-08-20"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 01e33cc4d4fe..ba6b140f29af 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -651,6 +651,7 @@ romainl/vim-qlist roman/golden-ratio romgrk/barbar.nvim romgrk/nvim-treesitter-context +ron-rs/ron.vim ron89/thesaurus_query.vim roxma/nvim-cm-racer roxma/nvim-completion-manager From f0aec20cd74d3080fdad4283aa103c10bc9bef38 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Wed, 10 Nov 2021 18:21:55 -0700 Subject: [PATCH 85/90] create-amis.sh: possible deprecation --- nixos/maintainers/scripts/ec2/create-amis.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 1df27e2db55a..797fe03e2095 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -1,6 +1,9 @@ #!/usr/bin/env nix-shell #!nix-shell -p awscli -p jq -p qemu -i bash # shellcheck shell=bash +# +# Future Deprecation? +# This entire thing should probably be replaced with a generic terraform config # Uploads and registers NixOS images built from the # amazonImage attribute. Images are uploaded and From 842a77939daad1f5aeb0a71beecd82c7364099f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 11 Nov 2021 17:23:04 +0100 Subject: [PATCH 86/90] python3Packages.simple-di: also rename directory --- .../python-modules/{simple_di => simple-di}/default.nix | 0 pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/python-modules/{simple_di => simple-di}/default.nix (100%) diff --git a/pkgs/development/python-modules/simple_di/default.nix b/pkgs/development/python-modules/simple-di/default.nix similarity index 100% rename from pkgs/development/python-modules/simple_di/default.nix rename to pkgs/development/python-modules/simple-di/default.nix diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b8dca23a305e..456930db6b17 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8534,7 +8534,7 @@ in { simplekml = callPackage ../development/python-modules/simplekml { }; - simple-di = callPackage ../development/python-modules/simple_di { }; + simple-di = callPackage ../development/python-modules/simple-di { }; simple-rest-client = callPackage ../development/python-modules/simple-rest-client { }; From 375493e22765a551938492dffe666911ac9d8c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 11 Nov 2021 17:36:54 +0100 Subject: [PATCH 87/90] mkpasswd: minor cleanup --- pkgs/tools/security/mkpasswd/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index 6064a80d6cd5..7fea400f008c 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -2,8 +2,7 @@ stdenv.mkDerivation { pname = "mkpasswd"; - inherit (whois) version; - inherit (whois) src; + inherit (whois) version src; nativeBuildInputs = [ perl pkg-config ]; buildInputs = [ libxcrypt ]; From 361cd4b7ded97453348305f4f89f40566b3abdf0 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Thu, 11 Nov 2021 11:39:39 -0500 Subject: [PATCH 88/90] tinyssh: init at 20210601-unstable (#144029) Co-authored-by: Dmitry Bogatov Co-authored-by: Sandro --- pkgs/tools/networking/tinyssh/default.nix | 28 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/networking/tinyssh/default.nix diff --git a/pkgs/tools/networking/tinyssh/default.nix b/pkgs/tools/networking/tinyssh/default.nix new file mode 100644 index 000000000000..9bfa8aa3ab53 --- /dev/null +++ b/pkgs/tools/networking/tinyssh/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "tinyssh"; + version = "20210601"; + + src = fetchFromGitHub { + owner = "janmojzis"; + repo = "tinyssh"; + rev = version; + sha256 = "sha256-+THoPiD6dW5ZuiQmmLckOJGyjhzdF3qF0DgC51zjGY8="; + }; + + preConfigure = '' + echo /bin > conf-bin + echo /share/man > conf-man + ''; + + DESTDIR = placeholder "out"; + + meta = with lib; { + description = "minimalistic SSH server"; + homepage = "https://tinyssh.org"; + license = licenses.publicDomain; + platforms = platforms.unix; + maintainers = [ maintainers.kaction ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 300f713caf0a..063f45624562 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8179,6 +8179,8 @@ with pkgs; opensm = callPackage ../tools/networking/opensm { }; + tinyssh = callPackage ../tools/networking/tinyssh { }; + opensshPackages = dontRecurseIntoAttrs (callPackage ../tools/networking/openssh {}); openssh = opensshPackages.openssh.override { From 750f9aaac938d50e2c93d57f197cc9968fa9b577 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 22 Oct 2021 17:23:48 +0200 Subject: [PATCH 89/90] hash-slinger: 2.7 -> 3.1 --- pkgs/tools/security/hash-slinger/default.nix | 60 +++++++++++++------- 1 file changed, 39 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/tools/security/hash-slinger/default.nix index ee06c112481b..e51d93e9d7fa 100644 --- a/pkgs/tools/security/hash-slinger/default.nix +++ b/pkgs/tools/security/hash-slinger/default.nix @@ -1,45 +1,63 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages, unbound, libreswan }: +{ lib +, stdenv +, fetchFromGitHub +, python3 +, unbound +, libreswan +}: -let - pythonPackages = python2Packages; -in stdenv.mkDerivation rec { - pname = "hash-slinger"; - version = "2.7"; +stdenv.mkDerivation rec { + pname = "hash-slinger"; + version = "3.1"; src = fetchFromGitHub { owner = "letoams"; repo = pname; rev = version; - sha256 = "05wn744ydclpnpyah6yfjqlfjlasrrhzj48lqmm5a91nyps5yqyn"; + sha256 = "sha256-mhMUdZt846QjwRIh2m/4EE+93fUcCKc2FFeoFpzKYvk="; }; - pythonPath = with pythonPackages; [ dnspython m2crypto ipaddr python-gnupg - pyunbound ]; + pythonPath = with python3.pkgs; [ + dnspython + m2crypto + python-gnupg + pyunbound + ]; - buildInputs = [ pythonPackages.wrapPython ]; - propagatedBuildInputs = [ unbound libreswan ] ++ pythonPath; - propagatedUserEnvPkgs = [ unbound libreswan ]; + buildInputs = [ + python3.pkgs.wrapPython + ]; - patchPhase = '' + propagatedBuildInputs = [ + unbound + libreswan + ] ++ pythonPath; + + propagatedUserEnvPkgs = [ + unbound + libreswan + ]; + + postPatch = '' substituteInPlace Makefile \ --replace "$(DESTDIR)/usr" "$out" substituteInPlace ipseckey \ --replace "/usr/sbin/ipsec" "${libreswan}/sbin/ipsec" substituteInPlace tlsa \ - --replace "/var/lib/unbound/root" "${pythonPackages.pyunbound}/etc/pyunbound/root" + --replace "/var/lib/unbound/root" "${python3.pkgs.pyunbound}/etc/pyunbound/root" patchShebangs * - ''; + ''; installPhase = '' - mkdir -p $out/bin $out/man $out/${pythonPackages.python.sitePackages}/ + mkdir -p $out/bin $out/man $out/lib/${python3.libPrefix}/site-packages make install wrapPythonPrograms - ''; + ''; - meta = { + meta = with lib; { description = "Various tools to generate special DNS records"; - homepage = "https://github.com/letoams/hash-slinger"; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.leenaars ]; + homepage = "https://github.com/letoams/hash-slinger"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ leenaars ]; }; } From a923032c74a4705d8ceac13a67f5cf8e7f6e708b Mon Sep 17 00:00:00 2001 From: Matthew Mazzanti Date: Thu, 11 Nov 2021 11:58:24 -0500 Subject: [PATCH 90/90] metrics: set NIX_STORE_DIR Mirror ca5ecbed4b5775f873fa15d7bf064b00d9e2862a to workaround NIX_STATE_DIR errors. As with the other workaround, see: https://github.com/NixOS/nix/issues/5495#issuecomment-963949707 --- pkgs/top-level/metrics.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix index c045439da1ab..1decb810f973 100644 --- a/pkgs/top-level/metrics.nix +++ b/pkgs/top-level/metrics.nix @@ -8,7 +8,8 @@ runCommand "nixpkgs-metrics" #requiredSystemFeatures = [ "benchmark" ]; # dedicated machine, by @vcunat last time } '' - export NIX_STATE_DIR=$TMPDIR + export NIX_STORE_DIR=$TMPDIR/store + export NIX_STATE_DIR=$TMPDIR/state export NIX_PAGER= nix-store --init