From fbafeb7ad5dd6196fcc5d84264e1706653a62f81 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 15 Aug 2021 17:12:23 +0200 Subject: [PATCH 1/8] 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 2/8] 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 3/8] 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 4/8] 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 5/8] 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 6/8] 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 7/8] 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 8/8] 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