From 01fa1637a0dcfd7fdbfae5068beb348aedeb28ad Mon Sep 17 00:00:00 2001 From: Michael Lingelbach Date: Thu, 15 Jul 2021 16:46:09 -0700 Subject: [PATCH 01/42] sumneko-lua-language-server: 1.20.2 -> 2.2.3 --- .../tools/sumneko-lua-language-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index 95c10ad7d26c..dd4a6f2e03ab 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "1.20.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-7Ishq/TonJsteHBGDTNjImIwGPdeRgPS1g60d8bhTYg="; + sha256 = "168n0f19glhdw955vrhz6h38ipydkbai5wv5qqaiaw2x7ajzh69y"; fetchSubmodules = true; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; ninjaFlags = [ - "-fninja/linux.ninja" + "-fcompile/ninja/linux.ninja" ]; postBuild = '' From 862b82a6a696a70fa34cae7e6689260fd3ec2f41 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 30 Jun 2021 10:36:56 -0400 Subject: [PATCH 02/42] pythonPackages.parsedatetime: skip impure tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Robert Schütz --- .../python-modules/parsedatetime/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix index ba3662a44b03..c6a4d193920b 100644 --- a/pkgs/development/python-modules/parsedatetime/default.nix +++ b/pkgs/development/python-modules/parsedatetime/default.nix @@ -2,9 +2,8 @@ , buildPythonPackage , fetchPypi , isPy27 -, pytest -, pytest-runner , future +, pytestCheckHook }: buildPythonPackage rec { @@ -17,13 +16,24 @@ buildPythonPackage rec { sha256 = "4cb368fbb18a0b7231f4d76119165451c8d2e35951455dfee97c62a87b04d455"; }; - buildInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ future ]; + checkInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "tests/Test*.py" ]; + + disabledTests = [ + # https://github.com/bear/parsedatetime/issues/263 + "testDate3ConfusedHourAndYear" + # https://github.com/bear/parsedatetime/issues/215 + "testFloat" + ]; + + pythonImportChecks = [ "parsedatetime" ]; + meta = with lib; { description = "Parse human-readable date/time text"; homepage = "https://github.com/bear/parsedatetime"; license = licenses.asl20; }; - } From 1893e2be4d9e97d963a03e52f0ba941544f48215 Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Tue, 10 Aug 2021 11:21:27 +0300 Subject: [PATCH 03/42] fetchzip: add extension parameter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fetchzip downloads the file from specified URL, renames it to basename of that url, and then relies on unzip to do the unpacking. The first consequence is that this requires URL to end with proper extension—otherwise it will fail to unpack. This is not always the case and input-fonts workarounds this by adding “&.zip” query parameter (which is obviously a hack and is not guaranteed to work with every URL). The second consequence is that basename of the url must be a valid filename. I’ve tried to build a custom configuration of input-fonts and I get an error from mv that the filename is too long: > trying https://input.djr.com/build/?fontSelection=fourStyleFamily®ular=InputMonoNarrow-Regular&italic=InputMonoNarrow-Italic&bold=InputMonoNarrow-Bold&boldItalic=InputMonoNarrow-BoldItalic&a=0&g=0&i=topserif&l=serifs_round&zero=0&asterisk=height&braces=straight&preset=default&line-height=1.2&accept=I+do&email=&.zip > % Total % Received % Xferd Average Speed Time Time Time Current > Dload Upload Total Spent Left Speed > 100 406k 100 406k 0 0 230k 0 0:00:01 0:00:01 --:--:-- 230k > mv: failed to access '/build/?fontSelection=fourStyleFamily®ular=InputMonoNarrow-Regular&italic=InputMonoNarrow-Italic&bold=InputMonoNarrow-Bold&boldItalic=InputMonoNarrow-BoldItalic&a=0&g=0&i=topserif&l=serifs_round&zero=0&asterisk=height&braces=straight&preset=default&line-height=1.2&accept=I+do&email=&.zip': File name too long We could use “name” parameter as the filename (that’s how it is used in fetchurl). However, the previous attempt to do so (fc01353703426458d6990239936659ed3130d294) was reverted (24b5eb61eb944036b5716788ead1b204fba08719) because of the introduced regression—many fetchzip invocations use names without extension (also the default name is just “source”). This commit adds an optional “extension” parameter. If it is set, fetchzip renames the downloaded file to “download.${extension}” effectively solving both problems above without introducing a massive regression. This is a no-op for all existing packages. Tested by updating my NixOS setup + the extra inputs-fonts configuration mentioned above + tons of unstable emacs packages after a nix-collect-garbage (3Gb downloaded) with this patch applied. --- pkgs/build-support/fetchzip/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index cde4d4f579f4..b174c252fc0e 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -13,10 +13,17 @@ , urls ? [] , extraPostFetch ? "" , name ? "source" +, # Allows to set the extension for the intermediate downloaded + # file. This can be used as a hint for the unpackCmdHooks to select + # an appropriate unpacking tool. + extension ? null , ... } @ args: (fetchurl (let - basename = baseNameOf (if url != "" then url else builtins.head urls); + tmpFilename = + if extension != null + then "download.${extension}" + else baseNameOf (if url != "" then url else builtins.head urls); in { inherit name; @@ -30,7 +37,7 @@ in { mkdir "$unpackDir" cd "$unpackDir" - renamed="$TMPDIR/${basename}" + renamed="$TMPDIR/${tmpFilename}" mv "$downloadedFile" "$renamed" unpackFile "$renamed" '' @@ -56,7 +63,7 @@ in { + '' chmod 755 "$out" ''; -} // removeAttrs args [ "stripRoot" "extraPostFetch" ])).overrideAttrs (x: { +} // removeAttrs args [ "stripRoot" "extraPostFetch" "extension" ])).overrideAttrs (x: { # Hackety-hack: we actually need unzip hooks, too nativeBuildInputs = x.nativeBuildInputs ++ [ unzip ]; }) From 966089cd21898feb73501f83fc087cf0cd0ebf39 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 04:14:46 +0000 Subject: [PATCH 04/42] wimlib: 1.13.2 -> 1.13.4 --- pkgs/tools/archivers/wimlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix index 4f397b9bf55f..cca62edfce6d 100644 --- a/pkgs/tools/archivers/wimlib/default.nix +++ b/pkgs/tools/archivers/wimlib/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - version = "1.13.2"; + version = "1.13.4"; pname = "wimlib"; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://wimlib.net/downloads/${pname}-${version}.tar.gz"; - sha256 = "0id9ym3hzij4kpdrk0sz3ijxp5r0z1md5jch83pml9hdy1zbx5bj"; + sha256 = "sha256-S4fdCtnMGljO5XIa/ruYAR2rVJ5y8rVVM/MV8Isu3hI="; }; preBuild = '' From f70908a3560662a55a63a1cfa314e79a4b8224ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 05:21:55 +0000 Subject: [PATCH 05/42] xfce.xfdashboard: 0.9.2 -> 0.9.3 --- pkgs/desktops/xfce/applications/xfdashboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfdashboard/default.nix b/pkgs/desktops/xfce/applications/xfdashboard/default.nix index 493a70a75ed0..527696c995ed 100644 --- a/pkgs/desktops/xfce/applications/xfdashboard/default.nix +++ b/pkgs/desktops/xfce/applications/xfdashboard/default.nix @@ -17,11 +17,11 @@ mkXfceDerivation { category = "apps"; pname = "xfdashboard"; - version = "0.9.2"; + version = "0.9.3"; rev-prefix = ""; odd-unstable = false; - sha256 = "sha256-Q6r9FoPl+vvqZWP5paAjT3VX3M/6TvqzrrGKPCH8+xo="; + sha256 = "sha256-xoeqVsfvBH2zzQqDUJGiA47hgVvEkvVf9bNYQmyiytk="; buildInputs = [ clutter From a043f581f8ea71e4d794771f19080f7f84a7df84 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 05:48:59 +0000 Subject: [PATCH 06/42] embree: 3.13.0 -> 3.13.1 --- pkgs/development/libraries/embree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index 3350c046a51a..b85c057217e7 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "embree"; - version = "3.13.0"; + version = "3.13.1"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "sha256-w93GYslQRg0rvguMKv/CuT3+JzIis2CRbY9jYUFKWOM="; + sha256 = "sha256-6BL/NnveIMg+xD8Zsc3sidL0iw0YbJITgd8Zf4Mh28I="; }; postPatch = '' From e8022e23670a4eae012a41b94c4f0c18eb392998 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 05:53:50 +0000 Subject: [PATCH 07/42] you-get: 0.4.1500 -> 0.4.1536 --- pkgs/tools/misc/you-get/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index f58fb349c959..8bd618d5a9dd 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1500"; + version = "0.4.1536"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "5a6cc0d661fe0cd4210bf467d6c89afd8611609e402690254722c1415736da92"; + sha256 = "78c9a113950344e06d18940bd11fe9a2f78b9d0bc8963cde300017ac1ffcef09"; }; meta = with lib; { From 4cdf72504956c3a045d496cd2d9160e5b33df0ce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 08:41:12 +0000 Subject: [PATCH 08/42] libyamlcpp: 0.6.3 -> 0.7.0 --- pkgs/development/libraries/libyaml-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index 13141923202a..ebfe53b25138 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libyaml-cpp"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "jbeder"; repo = "yaml-cpp"; rev = "yaml-cpp-${version}"; - sha256 = "0ykkxzxcwwiv8l8r697gyqh1nl582krpvi7m7l6b40ijnk4pw30s"; + sha256 = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk="; }; # implement https://github.com/jbeder/yaml-cpp/commit/52a1378e48e15d42a0b755af7146394c6eff998c From 218df5159cd2c0888afbc2cf6cefd280d007b22b Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 14 Aug 2021 13:27:15 +0200 Subject: [PATCH 09/42] sconsPackages: expose the python version used with scons This allows users of scons to pick the correct version of python. Previously we had issues with some build systems not picking the right python3 version when adding additional python modules to the build environment. A famous example of this is mongodb where additional python modules are required to run the scons build. This is change doesn't introduce rebuilds (to the best of my knowledge) as it only adds a passthru argument and changes how we pass the python version around. --- pkgs/development/tools/build-managers/scons/common.nix | 10 ++++++++-- .../development/tools/build-managers/scons/default.nix | 10 ++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix index 6af302851234..da276be7287c 100644 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ b/pkgs/development/tools/build-managers/scons/common.nix @@ -1,8 +1,8 @@ { version, sha256 }: -{ fetchurl, python3Packages, lib }: +{ fetchurl, python, lib }: -python3Packages.buildPythonApplication rec { +python.pkgs.buildPythonApplication rec { pname = "scons"; inherit version; @@ -29,6 +29,12 @@ python3Packages.buildPythonApplication rec { mv "$out/"*.1 "$out/share/man/man1/" ''; + passthru = { + # expose the used python version so tools using this (and extensing scos with other python modules) + # can use the exact same python version. + inherit python; + }; + meta = with lib; { description = "An improved, cross-platform substitute for Make"; longDescription = '' diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 4b07eb0501d8..884d7482faf5 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -1,16 +1,18 @@ -{ callPackage, python2Packages }: +{ callPackage, python2, python3 }: let - mkScons = args: callPackage (import ./common.nix args) { }; + mkScons = args: callPackage (import ./common.nix args) { + python = python3; + }; in { scons_3_0_1 = (mkScons { version = "3.0.1"; sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; - }).override { python3Packages = python2Packages; }; + }).override { python = python3; }; scons_3_1_2 = (mkScons { version = "3.1.2"; sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq"; - }).override { python3Packages = python2Packages; }; + }).override { python = python2; }; scons_latest = mkScons { version = "4.1.0"; sha256 = "11axk03142ziax6i3wwy9qpqp7r3i7h5jg9y2xzph9i15rv8vlkj"; From cd20497c66d45df7f986c34f9105338df1de7d41 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 14 Aug 2021 13:39:37 +0200 Subject: [PATCH 10/42] mongodb: pick python version from scons The python modules that we to the enviroment should always come from the same python version as scons as otherwise they can't be loaded. This unbreaks the build of mongodb 4.2 which pinned python to 3.8 while our python attribute moved on to 3.9 which is what scons uses now. --- pkgs/servers/nosql/mongodb/mongodb.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index 8a66528d81cd..7c66d348ffb0 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, sconsPackages, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp -, sasl, openssl, libpcap, python27, python38, curl, Security, CoreFoundation, cctools }: +, sasl, openssl, libpcap, curl, Security, CoreFoundation, cctools }: # Note: # The command line tools are written in Go as part of a different package (mongodb-tools) @@ -12,17 +12,16 @@ with lib; let variants = if versionAtLeast version "4.2" - then { python = python38.withPackages (ps: with ps; [ pyyaml cheetah3 psutil setuptools ]); + then rec { python = scons.python.withPackages (ps: with ps; [ pyyaml cheetah3 psutil setuptools ]); scons = sconsPackages.scons_latest; mozjsVersion = "60"; mozjsReplace = "defined(HAVE___SINCOS)"; } - else { python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]); + else rec { python = scons.python.withPackages (ps: with ps; [ pyyaml typing cheetah ]); scons = sconsPackages.scons_3_1_2; mozjsVersion = "45"; mozjsReplace = "defined(HAVE_SINCOS)"; }; - python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]); system-libraries = [ "boost" "pcre" From be5a10a11e8d7a2393afd6ce2819d4b0450e7324 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 14 Aug 2021 14:10:06 -0300 Subject: [PATCH 11/42] cbftp: init at 1173 --- pkgs/tools/networking/cbftp/default.nix | 46 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/tools/networking/cbftp/default.nix diff --git a/pkgs/tools/networking/cbftp/default.nix b/pkgs/tools/networking/cbftp/default.nix new file mode 100644 index 000000000000..e78b8a93dc67 --- /dev/null +++ b/pkgs/tools/networking/cbftp/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchurl +, ncurses +, openssl +}: + +stdenv.mkDerivation rec { + pname = "cbftp"; + version = "1173"; + + src = fetchurl { + url = "https://cbftp.eu/${pname}-r${version}.tar.gz"; + hash = "sha256-DE6fnLzWsx6Skz2LRJAaijjIqrYFB8/HPp45P5CcEc8="; + }; + + buildInputs = [ + ncurses + openssl + ]; + + dontConfigure = true; + + installPhase = '' + runHook preInstall + + install -D bin/* -t $out/bin/ + install -D API README -t $out/share/doc/${pname}/ + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://cbftp.eu/"; + description = " An advanced multi-purpose FTP/FXP client"; + longDescription = '' + Cbftp is an advanced multi-purpose FTP/FXP client that focuses on + efficient large-scale data spreading, while also supporting most regular + FTP/FXP use cases in a modern way. It runs in a terminal and provides a + semi-graphical user interface through ncurses. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbfbd62173cc..f7f71bf3cb0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2231,6 +2231,8 @@ with pkgs; croc = callPackage ../tools/networking/croc { }; + cbftp = callPackage ../tools/networking/cbftp { }; + cddl = callPackage ../development/tools/cddl { }; cedille = callPackage ../applications/science/logic/cedille From 98d8f2e8fed3ef69b4e9adb904a423822ac99407 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 01:13:14 +0000 Subject: [PATCH 12/42] glances: 3.2.2 -> 3.2.3 --- pkgs/applications/system/glances/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 1d1182ba0d57..8ddee9c0b49c 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.2.2"; + version = "3.2.3"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "13w7bxfizsfi3xyhharnindyn3dv3p9p54a4xwyhnnhczs8kqa8s"; + sha256 = "1nc8bdzzrzaircq3myd32w6arpy2prn739886cq2h47cpinxmvpr"; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): From b1618ce0c7e3eb4cb72377e6c20b86f40b2643bb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Aug 2021 10:09:55 +0200 Subject: [PATCH 13/42] python3Packages.python-box: 5.3.0 -> 5.4.0 --- pkgs/development/python-modules/python-box/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index cb176109fefb..54a06d09f8f6 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "python-box"; - version = "5.3.0"; + version = "5.4.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "cdgriffith"; repo = "Box"; rev = version; - sha256 = "0fhmkjdcacpwyg7fajqfvnv3n9xd9rxjdpvi8z3j73a1gls36gf4"; + sha256 = "sha256-1eRuTpwANyLjnAK1guPOQmH2EW0ITvC7nvyFcEUErz8="; }; propagatedBuildInputs = [ From 424ab91f0cdfe92d6c5509b86d4fb527a520c72c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Aug 2021 10:11:40 +0200 Subject: [PATCH 14/42] python3Packages.identify: 2.2.11 -> 2.2.13 --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 7e753e2e0594..c3232c1811a8 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "identify"; - version = "2.2.11"; + version = "2.2.13"; src = fetchFromGitHub { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E95tUg1gglDXfeCTead2c1e0JOynKu+TBd4LKklrtAE="; + sha256 = "sha256-lKdFHynKraN+eUeO1hFzoNsdMzRgmnBHQzPuKLH0Xvs="; }; checkInputs = [ From a8e5991ce3ee80e6aa294feb3a57f1458b76a8bd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 15 Aug 2021 10:12:23 +0200 Subject: [PATCH 15/42] python3Packages.pyvicare: 2.5.2 -> 2.6 --- pkgs/development/python-modules/pyvicare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 2bed27e6e8cf..f5586c69bd43 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.5.2"; + version = "2.6"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "sha256-Yur7ZtUBWmszo5KN4TDlLdSxzH5qL0mhJDFN74pH/ss="; + sha256 = "sha256-qvP51HVIOcLDJKq8/hcJyXKsI2iUFwoPQQZvTKE28KU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 4e6d730d5f0b3ca864a6ebacfae4fc0caf86aae5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 12:33:49 +0000 Subject: [PATCH 16/42] neo-cowsay: 1.0.1 -> 1.0.3 --- pkgs/tools/misc/neo-cowsay/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/neo-cowsay/default.nix b/pkgs/tools/misc/neo-cowsay/default.nix index 4ed1bd51696c..e6e95968a09f 100644 --- a/pkgs/tools/misc/neo-cowsay/default.nix +++ b/pkgs/tools/misc/neo-cowsay/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "neo-cowsay"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "Code-Hex"; repo = "Neo-cowsay"; rev = "v${version}"; - sha256 = "0c6lygdqi26mczij41sn8ckc3g6qaakkkh3iasf10a4d07amxci1"; + sha256 = "sha256-n01C6Z9nV2DDbSqgbOIZTqZAWXo6h4/NJdyFiOCh79A="; }; - vendorSha256 = "1clar59x2dvn7yj4fbylby9nrzy8kdixi48hkbmrv8g5l8n0wdl2"; + vendorSha256 = "sha256-4qMsyNFD2MclsseE+IAaNm5r0wHWdcwLLPsZ0JJ3qpw="; doCheck = false; From d7f1a5d63e7cdcccecf3e0ee268d1a4d38eb02b6 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 15 Aug 2021 16:35:26 +0300 Subject: [PATCH 17/42] php74Extensions.couchbase: 3.1.2 -> 3.2.0 --- pkgs/development/php-packages/couchbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix index 7e72af65a305..18513945bf99 100644 --- a/pkgs/development/php-packages/couchbase/default.nix +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -1,7 +1,7 @@ { lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php, substituteAll }: let pname = "couchbase"; - version = "3.1.2"; + version = "3.2.0"; in buildPecl { inherit pname version; @@ -10,7 +10,7 @@ buildPecl { owner = "couchbase"; repo = "php-couchbase"; rev = "v${version}"; - sha256 = "0zm2jm5lzjjqlhkiivm4v5gr4286pwqaf5nar1ga816hhwnyhj42"; + sha256 = "sha256-rvlyH28xWLIVwK3yqqdhkoD1h6kl8FDq3Byo7mhV3jM="; }; configureFlags = [ "--with-couchbase" ]; From 2a64ca263bd4e1a54659ec49a1c574087ea86310 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 15 Aug 2021 15:40:30 +0200 Subject: [PATCH 18/42] wimboot: 2.6.0 -> 2.7.3 --- pkgs/tools/misc/wimboot/default.nix | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/misc/wimboot/default.nix b/pkgs/tools/misc/wimboot/default.nix index 04dbca9ed63f..538f5113fd8d 100644 --- a/pkgs/tools/misc/wimboot/default.nix +++ b/pkgs/tools/misc/wimboot/default.nix @@ -1,38 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, libbfd, zlib, libiberty }: +{ lib, stdenv, fetchFromGitHub, libbfd, zlib, libiberty }: stdenv.mkDerivation rec { pname = "wimboot"; - version = "2.6.0"; + version = "2.7.3"; src = fetchFromGitHub { owner = "ipxe"; repo = "wimboot"; rev = "v${version}"; - sha256 = "134wqqr147az5vbj4szd0xffwa99b4rar7w33zm3119zsn7sd79k"; + sha256 = "12c677agkmiqs35qfpqfj7c4kxkizhbk9l6hig36dslzp4fwpl70"; }; - NIX_CFLAGS_COMPILE = "-Wno-address-of-packed-member"; # Fails on gcc9 - - patches = [ - # Fixes for newer binutils - # Add R_X86_64_PLT32 as known reloc target - (fetchpatch { - url = "https://github.com/ipxe/wimboot/commit/91be50c17d4d9f463109d5baafd70f9fdadd86db.patch"; - sha256 = "113448n49hmk8nz1dxbhxiciwl281zwalvb8z5p9xfnjvibj8274"; - }) - # Fix building with binutils 2.34 (bfd_get_section_* removed in favour of bfd_section_*) - (fetchpatch { - url = "https://github.com/ipxe/wimboot/commit/2f97e681703d30b33a4d5032a8025ab8b9f2de75.patch"; - sha256 = "0476mp74jaq3k099b654al6yi2yhgn37d9biz0wv3ln2q1gy94yf"; - }) - ]; - - # We cannot use sourceRoot because the patch wouldn't apply - postPatch = '' - cd src - ''; - - hardeningDisable = [ "pic" ]; + sourceRoot = "source/src"; buildInputs = [ libbfd zlib libiberty ]; makeFlags = [ "wimboot.x86_64.efi" ]; From 32138825dde896f76a89e343e54f84a6c256f5a9 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 15 Aug 2021 16:44:32 +0300 Subject: [PATCH 19/42] vultr-cli: 2.4.1 -> 2.7.0 --- pkgs/development/tools/vultr-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index b97a4438c05d..b953feea2211 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.4.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "sha256:0qbsybs91v9vnkxj4kpwqhzk4hgpkq36wnixxjajg038x7slds4i"; + sha256 = "sha256-3q0in41/ZGuZcMiu+5qT8AGttro2it89xp741RCxAYY="; }; vendorSha256 = null; From 56aba815bb409e12f6ef400c6c79cf9fed0d112b Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 15 Aug 2021 15:22:53 +0200 Subject: [PATCH 20/42] sumneko-lua-language-server: fix tests on aarch64 --- .../tools/sumneko-lua-language-server/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index dd4a6f2e03ab..a894f0b5bc36 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation rec { makeWrapper ]; + postPatch = '' + # doesn't work on aarch64, already removed on master: + # https://github.com/actboy168/bee.lua/commit/fd5ee552c8cff2c48eff72edc0c8db5b7bf1ee2c + rm {3rd/luamake/,}3rd/bee.lua/test/test_platform.lua + sed /test_platform/d -i {3rd/luamake/,}3rd/bee.lua/test/test.lua + ''; + preBuild = '' cd 3rd/luamake ''; From 12a6f2aa592019f82f3f9b29ccfbaa7e2e2cd358 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 15 Aug 2021 16:49:22 +0300 Subject: [PATCH 21/42] mtools: 4.0.34 -> 4.0.35 --- pkgs/tools/filesystems/mtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index d6fa4c41643c..41259f2a45e5 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mtools"; - version = "4.0.34"; + version = "4.0.35"; src = fetchurl { url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2"; - sha256 = "1aqc6qncpd8dlndwk05vgrnjh7pa151n6hpfsi059zhg3gml79dd"; + sha256 = "sha256-NHaeFzdR0vDYkaCMdsgEJ+kpuO5DQ4AZuGZsw9ekR0k="; }; patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; From 8079e99453e6e41bf54043e905e8cd2369b6c906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 15 Aug 2021 15:49:50 +0200 Subject: [PATCH 22/42] wezterm: 20210502-154244-3f7122cb -> 20210814-124438-54e29167 --- pkgs/applications/terminal-emulators/wezterm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 23dbeb3b63fa..7fdb33570722 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -59,13 +59,13 @@ in rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20210502-154244-3f7122cb"; + version = "20210814-124438-54e29167"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; - sha256 = "9HPhb7Vyy5DwBW1xeA6sEIBmmOXlky9lPShu6ZoixPw="; + sha256 = "sha256-6HXTftgAs6JMzOMCY+laN74in8xfjE8yJc5xSl9PQCE="; fetchSubmodules = true; }; @@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec { echo ${version} > .tag ''; - cargoSha256 = "sha256-cbZg2wc3G2ffMQBB6gd0vBbow5GRbXaj8Xh5ga1cMxU="; + cargoSha256 = "sha256-yjTrWoqIKoRV4oZQ0mfTGrIGmm89AaKJd16WL1Ozhnw="; nativeBuildInputs = [ pkg-config From 039fc793c35f5ea92a13a8a33a6f7edcd7b289f9 Mon Sep 17 00:00:00 2001 From: oxalica Date: Sun, 15 Aug 2021 20:09:40 +0800 Subject: [PATCH 23/42] vim_configurable: handle python3Dependencies --- pkgs/misc/vim-plugins/vim-utils.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index ca5381c59724..2f81820fe77e 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -3,6 +3,7 @@ , nix-prefetch-hg, nix-prefetch-git , fetchFromGitHub, runtimeShell , hasLuaModule +, python3 }: /* @@ -210,13 +211,24 @@ let # and can simply pass `null`. depsOfOptionalPlugins = lib.subtractLists opt (findDependenciesRecursively opt); startWithDeps = findDependenciesRecursively start; + allPlugins = lib.unique (startWithDeps ++ depsOfOptionalPlugins); + python3Env = python3.withPackages (ps: + lib.flatten (builtins.map (plugin: (plugin.python3Dependencies or (_: [])) ps) allPlugins) + ); in [ "mkdir -p $out/pack/${packageName}/start" ] # To avoid confusion, even dependencies of optional plugins are added # to `start` (except if they are explicitly listed as optional plugins). - ++ (builtins.map (x: link x packageName "start") (lib.unique (startWithDeps ++ depsOfOptionalPlugins))) + ++ (builtins.map (x: link x packageName "start") allPlugins) ++ ["mkdir -p $out/pack/${packageName}/opt"] ++ (builtins.map (x: link x packageName "opt") opt) + # Assemble all python3 dependencies into a single `site-packages` to avoid doing recursive dependency collection + # for each plugin. + # This directory is only for python import search path, and will not slow down the startup time. + ++ [ + "mkdir -p $out/pack/${packageName}/start/__python3_dependencies" + "ln -s ${python3Env}/${python3Env.sitePackages} $out/pack/${packageName}/start/__python3_dependencies/python3" + ] ); packDir = (packages: stdenv.mkDerivation { From 5fa791f953b9444601d7802fc8308b3392afa701 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 12:39:14 +0000 Subject: [PATCH 24/42] nextdns: 1.11.0 -> 1.35.0 --- pkgs/applications/networking/nextdns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index a27f1fdad257..dadd17be16f6 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nextdns"; - version = "1.11.0"; + version = "1.35.0"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-gnWFgzfMMnn8O7zDN5LW3cMIz5/wmgEW9fI9aJBEah8="; + sha256 = "sha256-AWbUtzh1kJayhg/ssJUqUX4ywIV2Oy1BgTorhb+x3Vg="; }; - vendorSha256 = "sha256-kmszMqkDMaL+Z6GcZmQyeRShKKS/VGdn9vabYPW/kCc="; + vendorSha256 = "sha256-EEDRJj5Iaglk0Y86XL/U512OjipBNJzcAv8Tb09a0g0="; doCheck = false; From b0e4309dd5f723569684372a98d600454fcdbc38 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 04:01:47 +0000 Subject: [PATCH 25/42] erlang-ls: 0.17.0 -> 0.18.0 --- pkgs/development/beam-modules/erlang-ls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index f2ba9a1815d8..4ed1e2fb2e9e 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, rebar3-proper, stdenv, lib }: let - version = "0.17.0"; + version = "0.18.0"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -18,7 +18,7 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "0szg9hx436cvy80sh94dzmf2rainnw3fjc84bv3hlzjwwzmxj9aw"; + sha256 = "sha256-miCl04qqrirVPubOs558yWvXP3Sgs3bcDuGO9DZIsow="; rev = version; }; releaseType = "escript"; From 340e3b85dedb289b970e2e7d415a842e60b1d8fb Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 15 Aug 2021 16:33:19 +0200 Subject: [PATCH 26/42] sumneko-lua-language-server: 2.2.3 -> 2.3.6 --- .../development/tools/sumneko-lua-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index a894f0b5bc36..9b0bba533f5f 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "2.2.3"; + version = "2.3.6"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "168n0f19glhdw955vrhz6h38ipydkbai5wv5qqaiaw2x7ajzh69y"; + sha256 = "sha256-iwmH4pbeKNkEYsaSd6I7ULSoEMwAtxOanF7vAutuW64="; fetchSubmodules = true; }; From a6f7fd64fb40ea07fac87533f57f0a25275c16f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 14:46:27 +0000 Subject: [PATCH 27/42] oneDNN: 2.2.1 -> 2.3.2 --- pkgs/development/libraries/oneDNN/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index cce17acbf0ac..42f05a656163 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "2.2.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "sha256-orsllgBt2EHuZOy9vkgDK3XT6BfbtyIPvO4REB9tAgs="; + sha256 = "sha256-sfTcBthrnt7m9AnzdwWl9yLu1jRpwUp8i9s9DlA3IJo="; }; outputs = [ "out" "dev" "doc" ]; From daae03bb4fa8d65486ed9b9b36a9b8f871ddc2a2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 14:51:08 +0000 Subject: [PATCH 28/42] onedrive: 2.4.12 -> 2.4.13 --- pkgs/applications/networking/sync/onedrive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index d53464df7a97..3cd95acafdc7 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.12"; + version = "2.4.13"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rG9W90+wGLnhnfhqJjUIFGP6ZcmaxGkrdhPxQVRyxoc="; + sha256 = "sha256-v1GSHwcP9EQaADIEKO14yotJBEEatbKugVJOCsTLr2w="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; From 16c9ec70e3df386e4be10c1915fa90e7d9907656 Mon Sep 17 00:00:00 2001 From: oxalica Date: Sun, 15 Aug 2021 22:09:46 +0800 Subject: [PATCH 29/42] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 70 ++++++++++++++--------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 36f1afa6726b..cb92bdad15e1 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -441,8 +441,8 @@ final: prev: src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "26cad008b416c608c4bbcc4bc7ea0962ac5304a0"; - sha256 = "09gv2ik1jlki6gi1c0zipl48xnlic37gdn8ban78w8lgb4fgsiss"; + rev = "64c2f6151d9794b83af47a26717973625587d8ef"; + sha256 = "1hysjkxd9g7lrwvsqw0c4ynnmshxijcbql4zl9mjww89fsz96i09"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -593,12 +593,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-08-09"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "6a9a0ee38d2d28fc978db89237cdceb40aea6de3"; - sha256 = "04ywmwbr8y86z6fgcx4w8w779rl0c9c3q8fazncmx24wmcmilhb5"; + rev = "9b224047e4596636cbc1e112d38d7b6bb48a2c15"; + sha256 = "105dsskbxir7w5665dfs5m2dwn4l85jwvmwflkqfvgf75538hgsw"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2664,12 +2664,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed-nvim"; - version = "2021-08-10"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "889e6360c3026fb35101f5d81db630721c526a18"; - sha256 = "03klvjqk7n2ssji1di2w204py32h13lb0jv4d7h6c52y442k0q37"; + rev = "a4a53a40eae92d9974efc5aaa73a628ff767cf06"; + sha256 = "1080wrf19vvjjfjkcag27rncic38lzl19vp6jxgr8vi5jppmnfd6"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3288,12 +3288,12 @@ final: prev: neoscroll-nvim = buildVimPluginFrom2Nix { pname = "neoscroll-nvim"; - version = "2021-07-23"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "bc1dc90b6697931fca5e19fdc4c2fa43d944269f"; - sha256 = "1ji348kp4w77dhw7byfqrdyv1z7xwn7dx54y1nvclpbbj36ya9wk"; + rev = "54879c6957ee5e833924064ff7fc17c144502ae9"; + sha256 = "0r5dxb2qh2nkchiq7ib7aqnr46gy82i9wpv21z3h0kdj03lb12sc"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -3540,12 +3540,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls-nvim"; - version = "2021-08-14"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "809f33f91f5f2f25bf68b52017d008ec6a1bf6bc"; - sha256 = "1d2yfcya0r11qgr3x28fgpgb3wzb5kjf3l5zxr7kqy103xfxcspf"; + rev = "fcd3964ff7e28b7b441942ecf4f0c9d22d5b7bc9"; + sha256 = "0zkb5sfchqc91w6gacb3c43cm2n4wxjp1npzslrl4n1x4bsddz5l"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5922,12 +5922,12 @@ final: prev: vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2021-07-25"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "aeea4d67e377659077d7db99cf3c582211e941eb"; - sha256 = "07lyyxhf79mwlwrkyp9yq61nfvj2mb2xhcf3gb60adwy7qxcfl2k"; + rev = "e3e3fce70997a8d3ebd08f28b212d58c5daded11"; + sha256 = "0z1zcmry9vmagz03wh0y7smxfwsaf2fc2frhkza48clafx324rf0"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -6174,12 +6174,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-08-08"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "865b453825f309a204909f13b5afa98d36f7369f"; - sha256 = "1zfbm81qnvz7rgi2awi29id5z0xr6qzv04pj0yaxyhyjmy7frjyk"; + rev = "7307a7bdae675d131d1e4ada2ea3dd84d2ffc303"; + sha256 = "0nqv1mqzizwx27jr8jmqqbb2a0dpyvlgpgbmv2fqk6gfqi44hkj8"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -7544,12 +7544,12 @@ final: prev: vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2021-08-12"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "46bb2d31329290d36d7af88d89e6b4f8d82c6581"; - sha256 = "0q7y661nifkmdqkq5hzbb4r1pz6n32hf2a4ac7x3k1lzcsh1ascq"; + rev = "85c248898f5ca66a865e917b30e0e75579fa5463"; + sha256 = "056v6g1fszw77nncbmrz8mv3zchp17g3d5cqmc1sawrfif131gyb"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -9454,12 +9454,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2021-08-09"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "3e28c3815c86637944e6425c444ab55cdd25528f"; - sha256 = "0b51mqizw4igzpjgs38pn9f0mn83hlalxv43swq3pkxray5vfav2"; + rev = "64545fecb865f8cbe7160a5d7d1b8367cea1656c"; + sha256 = "1m8g6j2086x3fq99158m4g2wcsp8v1s00wim0hka7zhfwz0pd7zp"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -9586,12 +9586,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2020-12-29"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "45dfc28c30b44041183d749cf724e3dba9ac65ef"; - sha256 = "1ipdynpg9v5mll1zimyiaxw4zzj004myh5xjky32z783lgi0qlxl"; + rev = "37544a5d3f028d93f9ad8c4445cd1dc623d08c5e"; + sha256 = "1s8q8hch38ydkfr2fd7259swgbpchs70shjharahl5vm3x72jpgy"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -9887,24 +9887,24 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-08-12"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "690a95cefcefa5be94dd7783721f510cbb41531a"; - sha256 = "0mj942xk9ndxw96vmlw3fs9h1m9vfkln4rva67qnkjqb4v84p30n"; + rev = "539742fdd56d13ada0aa3e9b0ab8690ca49b853f"; + sha256 = "03q6c2mb7gkhfzw6bjl77jsxffr3kb0vcj9ky80c6wmpi3vzmb1k"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPluginFrom2Nix { pname = "vimux"; - version = "2021-08-11"; + version = "2021-08-15"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "031cc6208ed93788ce8d8d71b83c9d81fdddeeb3"; - sha256 = "1a5sgrnkyngwn2b771b8bm2awsq36yr5f17wclxg7fcms2y43lgv"; + rev = "89604a4464c3069dbe31f7bc8dd16a5fbc88a303"; + sha256 = "1lr7zqza29xxwbki9fgfazrak6ybyvm1a782kbs3v3zip10xmm3x"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; From d2781c50ff84bf11472636b09a5187641457fa54 Mon Sep 17 00:00:00 2001 From: oxalica Date: Sun, 15 Aug 2021 22:31:22 +0800 Subject: [PATCH 30/42] vimPlugins.fcitx-vim: init at 2021-08-15 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/overrides.nix | 8 ++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 3 files changed, 21 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index cb92bdad15e1..ca33df47d49b 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1544,6 +1544,18 @@ final: prev: meta.homepage = "https://github.com/konfekt/fastfold/"; }; + fcitx-vim = buildVimPluginFrom2Nix { + pname = "fcitx-vim"; + version = "2021-08-15"; + src = fetchFromGitHub { + owner = "lilydjwg"; + repo = "fcitx.vim"; + rev = "4042bbb29c50a592062563f5042951abec696702"; + sha256 = "1y5c1nan5gajrz1l0zkqx0y3a8cpam6l62yd7x19z6dzn7m1b5yb"; + }; + meta.homepage = "https://github.com/lilydjwg/fcitx.vim/"; + }; + feline-nvim = buildVimPluginFrom2Nix { pname = "feline-nvim"; version = "2021-07-30"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 60f5fdce6218..53708a6edc98 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -214,6 +214,14 @@ self: super: { dependencies = with self; [ vimproc-vim vimshell-vim self.self forms ]; }); + fcitx-vim = super.fcitx-vim.overrideAttrs (old: { + passthru.python3Dependencies = ps: with ps; [ dbus-python ]; + meta = { + description = "Keep and restore fcitx state when leaving/re-entering insert mode or search mode"; + license = lib.licenses.mit; + }; + }); + forms = super.forms.overrideAttrs (old: { dependencies = with self; [ self.self ]; }); diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 0ebf780b8af1..cbd457cf4bf7 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -352,6 +352,7 @@ lifepillar/vim-gruvbox8 lifepillar/vim-mucomplete lighttiger2505/deoplete-vim-lsp lilydjwg/colorizer +lilydjwg/fcitx.vim@fcitx5 liuchengxu/vim-clap liuchengxu/vim-which-key liuchengxu/vista.vim From 49226e1ae56881f72df4756226a605634f3d1d40 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 14:55:32 +0000 Subject: [PATCH 31/42] oneshot: 1.4.1 -> 1.5.0 --- pkgs/tools/networking/oneshot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/oneshot/default.nix b/pkgs/tools/networking/oneshot/default.nix index 48c20643580f..2e809eb2d1bd 100644 --- a/pkgs/tools/networking/oneshot/default.nix +++ b/pkgs/tools/networking/oneshot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oneshot"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "raphaelreyna"; repo = "oneshot"; rev = "v${version}"; - sha256 = "sha256-UD67xYBb1rvGMSPurte5z2Hcd7+JtXDPbgp3BVBdLuk="; + sha256 = "sha256-LxLMETZzoeu7qEHpUFmo/h+7sdly+R5ZWsNhyttcbpA="; }; - vendorSha256 = "sha256-d+YE618OywSDOWiiULHENFEqzRmFVUFKPuPXnL1JubM="; + vendorSha256 = "sha256-rL/NWIIggvngTrdTDm1g1uH3vC55JF3cWllPc6Yb5jc="; doCheck = false; From fbafeb7ad5dd6196fcc5d84264e1706653a62f81 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 15 Aug 2021 17:12:23 +0200 Subject: [PATCH 32/42] treewide: runCommandNoCC -> runCommand This has been synonymous for ~5y. --- lib/tests/maintainers.nix | 4 ++-- lib/tests/release.nix | 2 +- nixos/lib/utils.nix | 2 +- nixos/modules/config/ldap.nix | 2 +- nixos/modules/config/networking.nix | 2 +- nixos/modules/services/backup/borgbackup.nix | 2 +- .../services/misc/matrix-appservice-irc.nix | 2 +- nixos/modules/services/misc/sourcehut/builds.nix | 4 ++-- nixos/modules/services/monitoring/thanos.nix | 2 +- nixos/modules/services/networking/cjdns.nix | 2 +- nixos/modules/services/web-apps/keycloak.nix | 4 ++-- nixos/modules/services/web-apps/node-red.nix | 2 +- nixos/modules/virtualisation/podman.nix | 2 +- nixos/tests/hockeypuck.nix | 2 +- nixos/tests/pleroma.nix | 2 +- nixos/tests/slurm.nix | 2 +- nixos/tests/unbound.nix | 2 +- nixos/tests/xmpp/prosody.nix | 2 +- pkgs/applications/office/minetime/default.nix | 4 ++-- .../terminal-emulators/foot/default.nix | 4 ++-- .../window-managers/wayfire/wrapper.nix | 4 ++-- pkgs/build-support/agda/default.nix | 4 ++-- pkgs/build-support/docker/examples.nix | 2 +- pkgs/build-support/nuget-to-nix/default.nix | 4 ++-- pkgs/data/fonts/powerline-symbols/default.nix | 4 ++-- pkgs/development/interpreters/cling/default.nix | 3 +-- .../tests/test_nix_pythonprefix/default.nix | 4 ++-- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- .../tools/poetry2nix/poetry2nix/editable.nix | 2 +- pkgs/games/xonotic/default.nix | 4 ++-- pkgs/pkgs-lib/formats.nix | 4 ++-- pkgs/pkgs-lib/tests/formats.nix | 2 +- pkgs/servers/http/nginx/modules.nix | 2 +- pkgs/servers/web-apps/discourse/default.nix | 4 ++-- pkgs/test/texlive/default.nix | 16 ++++++++-------- pkgs/tools/networking/openssh/copyid.nix | 4 ++-- 36 files changed, 58 insertions(+), 59 deletions(-) diff --git a/lib/tests/maintainers.nix b/lib/tests/maintainers.nix index d3ed398c80a1..2408a20af4b7 100644 --- a/lib/tests/maintainers.nix +++ b/lib/tests/maintainers.nix @@ -61,9 +61,9 @@ let missingGithubIds = lib.concatLists (lib.mapAttrsToList checkMaintainer lib.maintainers); - success = pkgs.runCommandNoCC "checked-maintainers-success" {} ">$out"; + success = pkgs.runCommand "checked-maintainers-success" {} ">$out"; - failure = pkgs.runCommandNoCC "checked-maintainers-failure" { + failure = pkgs.runCommand "checked-maintainers-failure" { nativeBuildInputs = [ pkgs.curl pkgs.jq ]; outputHash = "sha256:${lib.fakeSha256}"; outputHAlgo = "sha256"; diff --git a/lib/tests/release.nix b/lib/tests/release.nix index c3b05251f709..77e0e1af7555 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -3,7 +3,7 @@ pkgs ? import ../.. {} // { lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!"; } }: -pkgs.runCommandNoCC "nixpkgs-lib-tests" { +pkgs.runCommand "nixpkgs-lib-tests" { buildInputs = [ pkgs.nix (import ./check-eval.nix) diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index f1332ab55930..7fe812424f85 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -3,7 +3,7 @@ pkgs: with pkgs.lib; rec { # Copy configuration files to avoid having the entire sources in the system closure - copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' + copyFile = filePath: pkgs.runCommand (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' cp ${filePath} $out ''; diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix index 35813c168fd8..85cad8b93d8c 100644 --- a/nixos/modules/config/ldap.nix +++ b/nixos/modules/config/ldap.nix @@ -42,7 +42,7 @@ let # nslcd normally reads configuration from /etc/nslcd.conf. # this file might contain secrets. We append those at runtime, # so redirect its location to something more temporary. - nslcdWrapped = runCommandNoCC "nslcd-wrapped" { nativeBuildInputs = [ makeWrapper ]; } '' + nslcdWrapped = runCommand "nslcd-wrapped" { nativeBuildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin makeWrapper ${nss_pam_ldapd}/sbin/nslcd $out/bin/nslcd \ --set LD_PRELOAD "${pkgs.libredirect}/lib/libredirect.so" \ diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index dba8977e482c..8c4eec510e5d 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -190,7 +190,7 @@ in protocols.source = pkgs.iana-etc + "/etc/protocols"; # /etc/hosts: Hostname-to-IP mappings. - hosts.source = pkgs.runCommandNoCC "hosts" {} '' + hosts.source = pkgs.runCommand "hosts" {} '' cat ${escapeShellArgs cfg.hostFiles} > $out ''; diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index 18fb29fd72a5..ccbc7726392d 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -102,7 +102,7 @@ let mkWrapperDrv = { original, name, set ? {} }: - pkgs.runCommandNoCC "${name}-wrapper" { + pkgs.runCommand "${name}-wrapper" { buildInputs = [ pkgs.makeWrapper ]; } (with lib; '' makeWrapper "${original}" "$out/bin/${name}" \ diff --git a/nixos/modules/services/misc/matrix-appservice-irc.nix b/nixos/modules/services/misc/matrix-appservice-irc.nix index a0a5973d30f2..02627e51c932 100644 --- a/nixos/modules/services/misc/matrix-appservice-irc.nix +++ b/nixos/modules/services/misc/matrix-appservice-irc.nix @@ -10,7 +10,7 @@ let jsonType = (pkgs.formats.json {}).type; - configFile = pkgs.runCommandNoCC "matrix-appservice-irc.yml" { + configFile = pkgs.runCommand "matrix-appservice-irc.yml" { # Because this program will be run at build time, we need `nativeBuildInputs` nativeBuildInputs = [ (pkgs.python3.withPackages (ps: [ ps.pyyaml ps.jsonschema ])) ]; preferLocalBuild = true; diff --git a/nixos/modules/services/misc/sourcehut/builds.nix b/nixos/modules/services/misc/sourcehut/builds.nix index a17a1010dbf7..e446f08284f7 100644 --- a/nixos/modules/services/misc/sourcehut/builds.nix +++ b/nixos/modules/services/misc/sourcehut/builds.nix @@ -84,7 +84,7 @@ in (rev: archs: lib.attrsets.mapAttrsToList (arch: image: - pkgs.runCommandNoCC "buildsrht-images" { } '' + pkgs.runCommand "buildsrht-images" { } '' mkdir -p $out/${distro}/${rev}/${arch} ln -s ${image}/*.qcow2 $out/${distro}/${rev}/${arch}/root.img.qcow2 '') @@ -97,7 +97,7 @@ in "${pkgs.sourcehut.buildsrht}/lib/images" ]; }; - image_dir = pkgs.runCommandNoCC "builds.sr.ht-worker-images" { } '' + image_dir = pkgs.runCommand "builds.sr.ht-worker-images" { } '' mkdir -p $out/images cp -Lr ${image_dir_pre}/* $out/images ''; diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix index 474ea4b25054..96addf392bd7 100644 --- a/nixos/modules/services/monitoring/thanos.nix +++ b/nixos/modules/services/monitoring/thanos.nix @@ -63,7 +63,7 @@ let }; }; - toYAML = name: attrs: pkgs.runCommandNoCC name { + toYAML = name: attrs: pkgs.runCommand name { preferLocalBuild = true; json = builtins.toFile "${name}.json" (builtins.toJSON attrs); nativeBuildInputs = [ pkgs.remarshal ]; diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index f1a504b3e3f4..ca95d00c2ff8 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -39,7 +39,7 @@ let }; # Additional /etc/hosts entries for peers with an associated hostname - cjdnsExtraHosts = pkgs.runCommandNoCC "cjdns-hosts" {} '' + cjdnsExtraHosts = pkgs.runCommand "cjdns-hosts" {} '' exec >$out ${concatStringsSep "\n" (mapAttrsToList (k: v: optionalString (v.hostname != "") diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index dc66c2966564..b1bea222c7f7 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -281,7 +281,7 @@ in createLocalPostgreSQL = databaseActuallyCreateLocally && cfg.database.type == "postgresql"; createLocalMySQL = databaseActuallyCreateLocally && cfg.database.type == "mysql"; - mySqlCaKeystore = pkgs.runCommandNoCC "mysql-ca-keystore" {} '' + mySqlCaKeystore = pkgs.runCommand "mysql-ca-keystore" {} '' ${pkgs.jre}/bin/keytool -importcert -trustcacerts -alias MySQLCACert -file ${cfg.database.caCert} -keystore $out -storepass notsosecretpassword -noprompt ''; @@ -553,7 +553,7 @@ in jbossCliScript = pkgs.writeText "jboss-cli-script" (mkJbossScript keycloakConfig'); - keycloakConfig = pkgs.runCommandNoCC "keycloak-config" { + keycloakConfig = pkgs.runCommand "keycloak-config" { nativeBuildInputs = [ cfg.package ]; } '' export JBOSS_BASE_DIR="$(pwd -P)"; diff --git a/nixos/modules/services/web-apps/node-red.nix b/nixos/modules/services/web-apps/node-red.nix index 16cfb29cf572..4f6850ace214 100644 --- a/nixos/modules/services/web-apps/node-red.nix +++ b/nixos/modules/services/web-apps/node-red.nix @@ -6,7 +6,7 @@ let cfg = config.services.node-red; defaultUser = "node-red"; finalPackage = if cfg.withNpmAndGcc then node-red_withNpmAndGcc else cfg.package; - node-red_withNpmAndGcc = pkgs.runCommandNoCC "node-red" { + node-red_withNpmAndGcc = pkgs.runCommand "node-red" { nativeBuildInputs = [ pkgs.makeWrapper ]; } '' diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index e245004e04a6..893afee4c32d 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -9,7 +9,7 @@ let podmanPackage = (pkgs.podman.override { inherit (cfg) extraPackages; }); # Provides a fake "docker" binary mapping to podman - dockerCompat = pkgs.runCommandNoCC "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" { + dockerCompat = pkgs.runCommand "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" { outputs = [ "out" "man" ]; inherit (podmanPackage) meta; } '' diff --git a/nixos/tests/hockeypuck.nix b/nixos/tests/hockeypuck.nix index 79313f314fd2..19df9dee3d31 100644 --- a/nixos/tests/hockeypuck.nix +++ b/nixos/tests/hockeypuck.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let - gpgKeyring = (pkgs.runCommandNoCC "gpg-keyring" { buildInputs = [ pkgs.gnupg ]; } '' + gpgKeyring = (pkgs.runCommand "gpg-keyring" { buildInputs = [ pkgs.gnupg ]; } '' mkdir -p $out export GNUPGHOME=$out cat > foo <&1 | sed -n -e '/^.include/,''${' -e '/^ \/.*++/p' -e '}' > tmp sed -e 's/^/-isystem /' -i tmp diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix index 572cbdccbfb2..2030fab173a5 100644 --- a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix @@ -1,4 +1,4 @@ -{ interpreter, writeText, runCommandNoCC }: +{ interpreter, writeText, runCommand }: let @@ -19,7 +19,7 @@ let print(s) ''; -in runCommandNoCC "${interpreter.name}-site-prefix-mypy-test" {} '' +in runCommand "${interpreter.name}-site-prefix-mypy-test" {} '' ${pythonEnv}/bin/mypy ${pythonScript} touch $out '' diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 8c5a8d6306a2..90ad985cfb81 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, runCommandNoCC +, runCommand , fetchurl , fetchpatch , perl @@ -172,7 +172,7 @@ stdenv.mkDerivation rec { # (We pick just that one because using the other headers from `sdk` is not # compatible with our C++ standard library. This header is already in # the standard library on aarch64) - runCommandNoCC "${pname}_headers" {} '' + runCommand "${pname}_headers" {} '' install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h '' ) ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix b/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix index 12b659d4c348..1365d19032b4 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/editable.nix @@ -27,7 +27,7 @@ let (lib.generators.toINI { } pyProject.tool.poetry.plugins); # A python package that contains simple .egg-info and .pth files for an editable installation - editablePackage = python.pkgs.toPythonModule (pkgs.runCommandNoCC "${name}-editable" + editablePackage = python.pkgs.toPythonModule (pkgs.runCommand "${name}-editable" { } '' mkdir -p "$out/${python.sitePackages}" cd "$out/${python.sitePackages}" diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index b15e111970e9..6d7327714768 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommandNoCC, makeDesktopItem +{ lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommand, makeDesktopItem , xonotic-data, copyDesktopItems , # required for both unzip, libjpeg, zlib, libvorbis, curl @@ -130,7 +130,7 @@ in rec { passthru.version = version; }; - xonotic = runCommandNoCC "xonotic${variant}-${version}" { + xonotic = runCommand "xonotic${variant}-${version}" { inherit xonotic-unwrapped; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; desktopItems = [ desktopItem ]; diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index 4d5395664612..44c8f9135439 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -38,7 +38,7 @@ rec { }; in valueType; - generate = name: value: pkgs.runCommandNoCC name { + generate = name: value: pkgs.runCommand name { nativeBuildInputs = [ pkgs.jq ]; value = builtins.toJSON value; passAsFile = [ "value" ]; @@ -121,7 +121,7 @@ rec { }; in valueType; - generate = name: value: pkgs.runCommandNoCC name { + generate = name: value: pkgs.runCommand name { nativeBuildInputs = [ pkgs.remarshal ]; value = builtins.toJSON value; passAsFile = [ "value" ]; diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index 679fde015228..af19f6100eef 100644 --- a/pkgs/pkgs-lib/tests/formats.nix +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -14,7 +14,7 @@ let }) [ def ]); in formatSet.generate "test-format-file" config; - runBuildTest = name: { drv, expected }: pkgs.runCommandNoCC name {} '' + runBuildTest = name: { drv, expected }: pkgs.runCommand name {} '' if diff -u '${builtins.toFile "expected" expected}' '${drv}'; then touch "$out" else diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index e6cbff3316a7..568f6d8b9e50 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -50,7 +50,7 @@ in repo = "ngx_brotli"; rev = "25f86f0bac1101b6512135eac5f93c49c63609e3"; sha256 = "02hfvfa6milj40qc2ikpb9f95sxqvxk4hly3x74kqhysbdi06hhv"; - }; in pkgs.runCommandNoCC "ngx_brotli-src" {} '' + }; in pkgs.runCommand "ngx_brotli-src" {} '' cp -a ${gitsrc} $out substituteInPlace $out/filter/config \ --replace '$ngx_addon_dir/deps/brotli/c' ${lib.getDev pkgs.brotli} diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 74bd9a722349..7f3a46d941c7 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, runCommandNoCC, lib, nixosTests, writeShellScript +{ stdenv, makeWrapper, runCommand, lib, nixosTests, writeShellScript , fetchFromGitHub, bundlerEnv, callPackage , ruby, replace, gzip, gnutar, git, cacert, util-linux, gawk @@ -78,7 +78,7 @@ let ''; }); - rake = runCommandNoCC "discourse-rake" { + rake = runCommand "discourse-rake" { nativeBuildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index 2444334f5268..217a862e1c56 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -1,7 +1,7 @@ -{ lib, runCommandNoCC, fetchurl, file, texlive, writeShellScript }: +{ lib, runCommand, fetchurl, file, texlive, writeShellScript }: { - chktex = runCommandNoCC "texlive-test-chktex" { + chktex = runCommand "texlive-test-chktex" { nativeBuildInputs = [ (with texlive; combine { inherit scheme-infraonly chktex; }) ]; @@ -18,7 +18,7 @@ dvipng = lib.recurseIntoAttrs { # https://github.com/NixOS/nixpkgs/issues/75605 - basic = runCommandNoCC "texlive-test-dvipng-basic" { + basic = runCommand "texlive-test-dvipng-basic" { nativeBuildInputs = [ file texlive.combined.scheme-medium ]; input = fetchurl { name = "test_dvipng.tex"; @@ -40,7 +40,7 @@ ''; # test dvipng's limited capability to render postscript specials via GS - ghostscript = runCommandNoCC "texlive-test-ghostscript" { + ghostscript = runCommand "texlive-test-ghostscript" { nativeBuildInputs = [ file (with texlive; combine { inherit scheme-small dvipng; }) ]; input = builtins.toFile "postscript-sample.tex" '' \documentclass{minimal} @@ -81,7 +81,7 @@ }; # https://github.com/NixOS/nixpkgs/issues/75070 - dvisvgm = runCommandNoCC "texlive-test-dvisvgm" { + dvisvgm = runCommand "texlive-test-dvisvgm" { nativeBuildInputs = [ file texlive.combined.scheme-medium ]; input = builtins.toFile "dvisvgm-sample.tex" '' \documentclass{article} @@ -106,7 +106,7 @@ mv document*.svg "$out"/ ''; - texdoc = runCommandNoCC "texlive-test-texdoc" { + texdoc = runCommand "texlive-test-texdoc" { nativeBuildInputs = [ (with texlive; combine { inherit scheme-infraonly luatex texdoc; @@ -121,7 +121,7 @@ ''; # test that language files are generated as expected - hyphen-base = runCommandNoCC "texlive-test-hyphen-base" { + hyphen-base = runCommand "texlive-test-hyphen-base" { hyphenBase = lib.head texlive.hyphen-base.pkgs; schemeFull = texlive.combined.scheme-full; schemeInfraOnly = texlive.combined.scheme-infraonly; @@ -154,7 +154,7 @@ ''; # test that fmtutil.cnf is fully regenerated on scheme-full - fmtutilCnf = runCommandNoCC "texlive-test-fmtutil.cnf" { + fmtutilCnf = runCommand "texlive-test-fmtutil.cnf" { kpathsea = lib.head texlive.kpathsea.pkgs; schemeFull = texlive.combined.scheme-full; } '' diff --git a/pkgs/tools/networking/openssh/copyid.nix b/pkgs/tools/networking/openssh/copyid.nix index 71baa6a23f1f..40707c2a7346 100644 --- a/pkgs/tools/networking/openssh/copyid.nix +++ b/pkgs/tools/networking/openssh/copyid.nix @@ -1,6 +1,6 @@ -{ runCommandNoCC, openssh }: +{ runCommand, openssh }: -runCommandNoCC "ssh-copy-id-${openssh.version}" { +runCommand "ssh-copy-id-${openssh.version}" { meta = openssh.meta // { description = "A tool to copy SSH public keys to a remote machine"; priority = (openssh.meta.priority or 0) - 1; From 0d859a070e1e222ee442f5a3b2fbdf489856761a Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 15 Aug 2021 17:14:27 +0200 Subject: [PATCH 33/42] yarn2nix-moretea: Generate runCommand instead of -NoCC This has been synonymous for ~5y. --- .../tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js index cebe7c715d1b..b82372fd5b6d 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js @@ -57,7 +57,7 @@ function fetchgit(fileName, url, rev, branch, builtinFetchGit) { sha256 = "${prefetchgit(url, rev)}"; }; `}in - runCommandNoCC "${fileName}" { buildInputs = [gnutar]; } '' + runCommand "${fileName}" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C \${repo} . @@ -104,7 +104,7 @@ function fetchLockedDep(builtinFetchGit) { } const HEAD = ` -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ `.trim() From a201246bac60c09e51b1659ae61fdbdc242c3269 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 15 Aug 2021 17:16:57 +0200 Subject: [PATCH 34/42] treewide: runCommandNoCC -> runCommand in generated code This has been synonymous for ~5y. Note that many of these runCommand bindings are unused, but that's ok for generated code. --- pkgs/applications/editors/uivonim/yarn.nix | 2 +- .../applications/networking/browsers/vieb/yarn.nix | 2 +- .../element/element-desktop-yarndeps.nix | 2 +- .../instant-messengers/element/keytar/yarn.nix | 2 +- .../instant-messengers/element/seshat/yarn.nix | 2 +- .../networking/powerdns-admin/yarndeps.nix | 2 +- .../version-management/gitlab/yarnPkgs.nix | 2 +- pkgs/development/compilers/emscripten/yarn.nix | 2 +- .../python-modules/apache-airflow/yarn.nix | 2 +- .../tools/yarn2nix-moretea/yarn2nix/yarn.nix | 2 +- pkgs/servers/gotify/yarndeps.nix | 2 +- pkgs/servers/mastodon/yarn.nix | 2 +- .../yarn-dependencies.nix | 6 +++--- .../monitoring/grafana-image-renderer/yarn.nix | 2 +- .../monitoring/prometheus/webui-yarndeps.nix | 2 +- .../servers/nosql/influxdb2/influx-ui-yarndeps.nix | 2 +- pkgs/servers/web-apps/hedgedoc/yarn.nix | 14 +++++++------- pkgs/servers/web-apps/plausible/yarn.nix | 2 +- pkgs/tools/admin/meshcentral/yarn.nix | 2 +- pkgs/tools/graphics/puppeteer-cli/yarn.nix | 2 +- 20 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/editors/uivonim/yarn.nix b/pkgs/applications/editors/uivonim/yarn.nix index aa2b10eac22a..c56dad1e41b9 100644 --- a/pkgs/applications/editors/uivonim/yarn.nix +++ b/pkgs/applications/editors/uivonim/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/pkgs/applications/networking/browsers/vieb/yarn.nix b/pkgs/applications/networking/browsers/vieb/yarn.nix index a92d6defef9f..6f045bd27e63 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.nix +++ b/pkgs/applications/networking/browsers/vieb/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index d4a48f31e91e..45395cdb6077 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/yarn.nix b/pkgs/applications/networking/instant-messengers/element/keytar/yarn.nix index d9c163c4e361..d6b1b99da84d 100644 --- a/pkgs/applications/networking/instant-messengers/element/keytar/yarn.nix +++ b/pkgs/applications/networking/instant-messengers/element/keytar/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/yarn.nix b/pkgs/applications/networking/instant-messengers/element/seshat/yarn.nix index e9a6333cbb2a..b861502bf719 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/yarn.nix +++ b/pkgs/applications/networking/instant-messengers/element/seshat/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/pkgs/applications/networking/powerdns-admin/yarndeps.nix b/pkgs/applications/networking/powerdns-admin/yarndeps.nix index ce65d28c0087..02d9eb0046e3 100644 --- a/pkgs/applications/networking/powerdns-admin/yarndeps.nix +++ b/pkgs/applications/networking/powerdns-admin/yarndeps.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index 519625a1930b..a7b91b7df538 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/pkgs/development/compilers/emscripten/yarn.nix b/pkgs/development/compilers/emscripten/yarn.nix index d0c3395f28af..f053d5f30c7a 100644 --- a/pkgs/development/compilers/emscripten/yarn.nix +++ b/pkgs/development/compilers/emscripten/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/pkgs/development/python-modules/apache-airflow/yarn.nix b/pkgs/development/python-modules/apache-airflow/yarn.nix index a0388a1af3ec..c1c9b8d7857a 100644 --- a/pkgs/development/python-modules/apache-airflow/yarn.nix +++ b/pkgs/development/python-modules/apache-airflow/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix index b8dba6833fbf..98c19af79fb5 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/pkgs/servers/gotify/yarndeps.nix b/pkgs/servers/gotify/yarndeps.nix index c6631cd96069..a0237663984d 100644 --- a/pkgs/servers/gotify/yarndeps.nix +++ b/pkgs/servers/gotify/yarndeps.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/pkgs/servers/mastodon/yarn.nix b/pkgs/servers/mastodon/yarn.nix index 01aa11cfcac0..be436875f979 100644 --- a/pkgs/servers/mastodon/yarn.nix +++ b/pkgs/servers/mastodon/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/pkgs/servers/matrix-appservice-discord/yarn-dependencies.nix b/pkgs/servers/matrix-appservice-discord/yarn-dependencies.nix index 83923458bf2d..1d2246034e36 100644 --- a/pkgs/servers/matrix-appservice-discord/yarn-dependencies.nix +++ b/pkgs/servers/matrix-appservice-discord/yarn-dependencies.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { @@ -683,7 +683,7 @@ sha256 = "1iy8as2ax50xqp1bkqb18dspkdjw6qdmvz803xaijp14bwx0shja"; }; in - runCommandNoCC "git___github.com_Sorunome_better_discord.js.git" { buildInputs = [gnutar]; } '' + runCommand "git___github.com_Sorunome_better_discord.js.git" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . @@ -1291,7 +1291,7 @@ sha256 = "0p7hlgdyfcipfjjx5hxwkqd524cmys9yxgqx29wmqkgjxp8xgwhy"; }; in - runCommandNoCC "git___github.com_Sorunome_discord_markdown.git" { buildInputs = [gnutar]; } '' + runCommand "git___github.com_Sorunome_discord_markdown.git" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . diff --git a/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix b/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix index 7eb3a3bb8a76..5cec9f36ef28 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix index 496d2fff4ae1..c8c4e50e0ebd 100644 --- a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix +++ b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix b/pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix index 53795e76322e..bc92013b1472 100644 --- a/pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix +++ b/pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/pkgs/servers/web-apps/hedgedoc/yarn.nix b/pkgs/servers/web-apps/hedgedoc/yarn.nix index d18891f619fc..5d7cbc1c02db 100644 --- a/pkgs/servers/web-apps/hedgedoc/yarn.nix +++ b/pkgs/servers/web-apps/hedgedoc/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { @@ -651,7 +651,7 @@ sha256 = "1pa8cqbr758vx1q2ymsmbkp9cz3b7bghxzi90zc4hfq1nzav5w85"; }; in - runCommandNoCC "Idle.js" { buildInputs = [gnutar]; } '' + runCommand "Idle.js" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . @@ -2403,7 +2403,7 @@ sha256 = "0b6axzi9kwsd24pcqfk5rmy9nhsdyklpd3z8w9wiynd64435dilz"; }; in - runCommandNoCC "CodeMirror.git" { buildInputs = [gnutar]; } '' + runCommand "CodeMirror.git" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . @@ -3531,7 +3531,7 @@ sha256 = "0hlv66cxrqih7spnissl44jd8f8x9dyvzc68fn0g2fwwrnpjjib7"; }; in - runCommandNoCC "diff-match-patch.git" { buildInputs = [gnutar]; } '' + runCommand "diff-match-patch.git" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . @@ -6203,7 +6203,7 @@ sha256 = "0d2zf62fmad760rg9hrkyhp03k5apms3fm0mf64yy8q6p3iw7jvw"; }; in - runCommandNoCC "js-sequence-diagrams.git" { buildInputs = [gnutar]; } '' + runCommand "js-sequence-diagrams.git" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . @@ -6923,7 +6923,7 @@ sha256 = "036v1a9z79mc961xxx0rw8p6n2w1z8bnqpapgfg2kbw8f87jfxyi"; }; in - runCommandNoCC "lz-string.git" { buildInputs = [gnutar]; } '' + runCommand "lz-string.git" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . @@ -7323,7 +7323,7 @@ sha256 = "1rgmap95akwf9z72msxpqcfy95h8pqz9c8vn9xvvibfb5jf46lv0"; }; in - runCommandNoCC "meta-marked" { buildInputs = [gnutar]; } '' + runCommand "meta-marked" { buildInputs = [gnutar]; } '' # Set u+w because tar-fs can't unpack archives with read-only dirs # https://github.com/mafintosh/tar-fs/issues/79 tar cf $out --mode u+w -C ${repo} . diff --git a/pkgs/servers/web-apps/plausible/yarn.nix b/pkgs/servers/web-apps/plausible/yarn.nix index 303ccb31c551..3b29c311445c 100644 --- a/pkgs/servers/web-apps/plausible/yarn.nix +++ b/pkgs/servers/web-apps/plausible/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/pkgs/tools/admin/meshcentral/yarn.nix b/pkgs/tools/admin/meshcentral/yarn.nix index 6e78523b66d6..2fd6d9007521 100644 --- a/pkgs/tools/admin/meshcentral/yarn.nix +++ b/pkgs/tools/admin/meshcentral/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { diff --git a/pkgs/tools/graphics/puppeteer-cli/yarn.nix b/pkgs/tools/graphics/puppeteer-cli/yarn.nix index 773acc84f352..469e2f23e056 100644 --- a/pkgs/tools/graphics/puppeteer-cli/yarn.nix +++ b/pkgs/tools/graphics/puppeteer-cli/yarn.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { From 1f20a1097d364a5d3eba2c15a3b5e10d38c23949 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 15 Aug 2021 17:23:07 +0200 Subject: [PATCH 35/42] treewide: runCommandNoCCLocal -> runCommandLocal It has always been a synonym. --- nixos/modules/services/monitoring/prometheus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 3be247ffb24e..1161d18ab14b 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -10,7 +10,7 @@ let # a wrapper that verifies that the configuration is valid promtoolCheck = what: name: file: if cfg.checkConfig then - pkgs.runCommandNoCCLocal + pkgs.runCommandLocal "${name}-${replaceStrings [" "] [""] what}-checked" { buildInputs = [ cfg.package ]; } '' ln -s ${file} $out @@ -19,7 +19,7 @@ let # Pretty-print JSON to a file writePrettyJSON = name: x: - pkgs.runCommandNoCCLocal name {} '' + pkgs.runCommandLocal name {} '' echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out ''; From a13aa64bd3318a966fbea471bb1b167a76eec184 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 15 Aug 2021 17:23:55 +0200 Subject: [PATCH 36/42] build-support/rust: remove unused runCommandNoCC --- pkgs/build-support/rust/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index be983af1c114..58b91b88e80b 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -8,7 +8,6 @@ , cargoSetupHook , fetchCargoTarball , importCargoLock -, runCommandNoCC , rustPlatform , callPackage , remarshal From 9feb144c8cc4f4b71a9c23b2f7fd6b2ea55649e5 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 15 Aug 2021 17:21:15 +0200 Subject: [PATCH 37/42] runCommandNoCC: deprecate It has been synonymous with runCommand ~5y. --- pkgs/build-support/trivial-builders.nix | 7 ++----- pkgs/top-level/aliases.nix | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 6f51ba512c12..43ff0018714f 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -24,16 +24,13 @@ rec { * `allowSubstitutes = false;` * to a derivation’s attributes. */ - runCommand = runCommandNoCC; - runCommandLocal = runCommandNoCCLocal; - - runCommandNoCC = name: env: runCommandWith { + runCommand = name: env: runCommandWith { stdenv = stdenvNoCC; runLocal = false; inherit name; derivationArgs = env; }; - runCommandNoCCLocal = name: env: runCommandWith { + runCommandLocal = name: env: runCommandWith { stdenv = stdenvNoCC; runLocal = true; inherit name; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5a16b3c9e552..d529b474aff3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -728,6 +728,8 @@ mapAliases ({ rubyPackages_2_5 = throw "rubyPackages_2_5 was deprecated in 2021-02: use a newer version of rubyPackages instead"; rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby"; rubyMinimal = throw "rubyMinimal was removed due to being unused"; + runCommandNoCC = lib.warn "runCommandNoCC is deprecated. Use the equivalent runCommand function instead." runCommand; + runCommandNoCCLocal = lib.warn "runCommandNoCCLocal is deprecated. Use the equivalent runCommandLocal function instead." runCommandLocal; runwayml = throw "runwayml is now a webapp"; # added 2021-04-17 rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02 rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02 From 321045ad35d88939d60c440f7471660532bf2149 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 15 Aug 2021 17:52:06 +0200 Subject: [PATCH 38/42] listadmin: fix deprecation --- pkgs/applications/networking/listadmin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/listadmin/default.nix b/pkgs/applications/networking/listadmin/default.nix index f33b6ff0a1c4..a59f65995e2e 100644 --- a/pkgs/applications/networking/listadmin/default.nix +++ b/pkgs/applications/networking/listadmin/default.nix @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec { wrapProgram $out/bin/listadmin \ --prefix PERL5LIB : "${with perl.pkgs; makeFullPerlPath [ - TextReform NetINET6Glue LWPProtocolhttps + TextReform NetINET6Glue LWPProtocolHttps ]}" ''; From d6aafb3be95c156bfdb0992fae27bc3491a8b6e5 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 15 Aug 2021 17:52:55 +0200 Subject: [PATCH 39/42] nixpkgs-basic-release-checks: Check without aliases This allows the aliases file to produce deprecation warnings without triggering the check against warnings. This allows for a better user experience when deprecations occur. Moreover, Nixpkgs itself shouldn't rely on its backcompat aliases. --- pkgs/top-level/nixpkgs-basic-release-checks.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/nixpkgs-basic-release-checks.nix b/pkgs/top-level/nixpkgs-basic-release-checks.nix index ffd92d587ba1..777cce7e5e0c 100644 --- a/pkgs/top-level/nixpkgs-basic-release-checks.nix +++ b/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -34,6 +34,7 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; } nix-env -f $src \ --show-trace --argstr system "$platform" \ + --arg config '{ allowAliases = false; }' \ -qa --drv-path --system-filter \* --system \ "''${opts[@]}" 2>&1 >/dev/null | tee eval-warnings.log @@ -45,6 +46,7 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; } nix-env -f $src \ --show-trace --argstr system "$platform" \ + --arg config '{ allowAliases = false; }' \ -qa --drv-path --system-filter \* --system --meta --xml \ "''${opts[@]}" > /dev/null done From 57f3504e3571bc2d28aabe5b44081eb6cc9c0533 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 15 Aug 2021 18:01:10 +0200 Subject: [PATCH 40/42] runCommandNoCC: fix ofborg status The original pr was merged a bit too soon. Removing the deprecation warning shouldn't be necessary, but for now, we need to prioritize making ofborg green. --- pkgs/top-level/aliases.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d529b474aff3..7387d7188384 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -728,8 +728,8 @@ mapAliases ({ rubyPackages_2_5 = throw "rubyPackages_2_5 was deprecated in 2021-02: use a newer version of rubyPackages instead"; rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby"; rubyMinimal = throw "rubyMinimal was removed due to being unused"; - runCommandNoCC = lib.warn "runCommandNoCC is deprecated. Use the equivalent runCommand function instead." runCommand; - runCommandNoCCLocal = lib.warn "runCommandNoCCLocal is deprecated. Use the equivalent runCommandLocal function instead." runCommandLocal; + runCommandNoCC = runCommand; + runCommandNoCCLocal = runCommandLocal; runwayml = throw "runwayml is now a webapp"; # added 2021-04-17 rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02 rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02 From 2c045900b75d5fed44a0a01535f722e02b880416 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 14 Aug 2021 21:56:01 -0400 Subject: [PATCH 41/42] vimPlugins.plenary-nvim: don't build from luaPackages.plenary-nvim --- pkgs/misc/vim-plugins/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 53708a6edc98..a5ec30daa711 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -292,7 +292,7 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }); - plenary-nvim = super.toVimPlugin(luaPackages.plenary-nvim); + # plenary-nvim = super.toVimPlugin(luaPackages.plenary-nvim); gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: { dependencies = with self; [ lush-nvim ]; From 3ab8ce12c2db31268f579c11727d9c63cfee2eee Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 12 Aug 2021 00:48:29 +0200 Subject: [PATCH 42/42] neovide: fix meta.mainProgram it was trying to start neovide-unstable --- pkgs/applications/editors/neovim/neovide/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index 7733f123ac01..75d20a12a0d9 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -116,5 +116,6 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ mit ]; maintainers = with maintainers; [ ck3d ]; platforms = platforms.linux; + mainProgram = "neovide"; }; }