From a8f616d11c6df6677b940cdb0c8945c5c1b0998e Mon Sep 17 00:00:00 2001 From: Harsh Modi Date: Fri, 18 Aug 2023 22:10:46 -0700 Subject: bazel_6: Add diffutils and gnupatch to initialEnvironment Nix's version of bazel has custom patches to make bazel more hermetic when used with nix. One of those is limiting the default environment of Bash. However, this default environment is insufficient because lots of programs rely on diff being in the path like buildifier, golangci-lint, and other things since golang diff implementations aren't very good. Ideally we'd include "diffutils" as part of this list for rules that assume the presence of "diff" and don't allow nice knobs to configure otherwise. Furthermore, bazel has a lot of internal facilities that utilize patch (like when downloading workspaces, we have the option of patching them), so include gnupatch as well. Fixes #249846 --- pkgs/development/tools/build-managers/bazel/bazel_6/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index fca02e80ee5..545236b561c 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -4,6 +4,7 @@ , bazel_self , lr, xe, zip, unzip, bash, writeCBin, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils +, diffutils, gnupatch # updater , python3, writeScript # Apple dependencies @@ -110,10 +111,12 @@ let [ bash coreutils + diffutils file findutils gawk gnugrep + gnupatch gnused gnutar gzip -- cgit 1.4.1 From 59c4461cf8ce800653f8783b531825431b5adfad Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Sat, 23 Sep 2023 18:34:51 -0700 Subject: gitmoji-cli: use fetchYarnDeps --- pkgs/by-name/gi/gitmoji-cli/package.nix | 75 +++++ pkgs/development/node-packages/aliases.nix | 1 + pkgs/development/node-packages/main-programs.nix | 1 - pkgs/development/node-packages/node-packages.json | 1 - pkgs/development/node-packages/node-packages.nix | 323 ---------------------- 5 files changed, 76 insertions(+), 325 deletions(-) create mode 100644 pkgs/by-name/gi/gitmoji-cli/package.nix diff --git a/pkgs/by-name/gi/gitmoji-cli/package.nix b/pkgs/by-name/gi/gitmoji-cli/package.nix new file mode 100644 index 00000000000..a6f23e10bce --- /dev/null +++ b/pkgs/by-name/gi/gitmoji-cli/package.nix @@ -0,0 +1,75 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchYarnDeps +, makeWrapper +, nodejs +, prefetch-yarn-deps +, yarn +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gitmoji-cli"; + version = "8.5.0"; + + src = fetchFromGitHub { + owner = "carloscuesta"; + repo = "gitmoji-cli"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ZM6jOi0FnomkIZeK6ln1Z0d6R5cjav67qyly3yqR1HQ="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/yarn.lock"; + hash = "sha256-HSAWFVOTlXlG7N5591hpfPAYaSrP413upW5u/HN9X2o="; + }; + + nativeBuildInputs = [ + makeWrapper + nodejs + prefetch-yarn-deps + yarn + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror $offlineCache + fixup-yarn-lock yarn.lock + yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install + patchShebangs node_modules + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + yarn --offline --production install + + mkdir -p "$out/lib/node_modules/gitmoji-cli" + cp -r lib node_modules "$out/lib/node_modules/gitmoji-cli" + + makeWrapper "${nodejs}/bin/node" "$out/bin/gitmoji" \ + --add-flags "$out/lib/node_modules/gitmoji-cli/lib/cli.js" + + runHook postInstall + ''; + + meta = { + description = "Gitmoji client for using emojis on commit messages"; + homepage = "https://github.com/carloscuesta/gitmoji-cli"; + license = lib.licenses.mit; + mainProgram = "gitmoji"; + maintainers = with lib.maintainers; [ nequissimus ]; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 6403ef4aaa9..6c401ffd79b 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -72,6 +72,7 @@ mapAliases { inherit (pkgs) firebase-tools; # added 2023-08-18 flood = pkgs.flood; # Added 2023-07-25 git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) gitmoji-cli; # added 2023-09-23 glob = pkgs.node-glob; # added 2023-08-18 inherit (pkgs) gqlint; # added 2023-08-19 inherit (pkgs) graphqurl; # added 2023-08-19 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index e4aa11738cc..2ca45fd86ec 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -37,7 +37,6 @@ fkill-cli = "fkill"; fleek-cli = "fleek"; git-run = "gr"; - gitmoji-cli = "gitmoji"; graphql-cli = "graphql"; graphql-language-service-cli = "graphql-lsp"; grunt-cli = "grunt"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 925e8b050da..61e61f787ea 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -125,7 +125,6 @@ , "git-run" , "git-standup" , "@gitbeaker/cli" -, "gitmoji-cli" , "gramma" , "grammarly-languageserver" , "graphql" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 72af9e92a6f..567206bde75 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -79732,329 +79732,6 @@ in bypassCache = true; reconstructLock = true; }; - gitmoji-cli = nodeEnv.buildNodePackage { - name = "gitmoji-cli"; - packageName = "gitmoji-cli"; - version = "8.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-8.5.0.tgz"; - sha512 = "ZSplvgm8UiAjsWBOxYAfbLj8JTMFj5TjB6yM7RFlqEfsFMgP0fhIPpgnHU5aMiyVyvX6jBRVf1hzjrmP3/cgiA=="; - }; - dependencies = [ - sources."@ljharb/through-2.3.9" - sources."@pnpm/config.env-replace-1.1.0" - (sources."@pnpm/network.ca-file-1.0.2" // { - dependencies = [ - sources."graceful-fs-4.2.10" - ]; - }) - sources."@pnpm/npm-conf-2.2.2" - sources."@sindresorhus/is-5.6.0" - sources."@szmarczak/http-timer-5.0.1" - sources."@tootallnate/quickjs-emscripten-0.23.0" - sources."@types/http-cache-semantics-4.0.2" - sources."agent-base-7.1.0" - sources."ajv-8.12.0" - sources."ajv-formats-2.1.1" - sources."ansi-align-3.0.1" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."ast-types-0.13.4" - sources."atomically-2.0.2" - sources."base64-js-1.5.1" - sources."basic-ftp-5.0.3" - sources."bl-4.1.0" - (sources."boxen-7.1.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."ansi-styles-6.2.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - sources."wrap-ansi-8.1.0" - ]; - }) - sources."buffer-5.7.1" - sources."cacheable-lookup-7.0.0" - (sources."cacheable-request-10.2.13" // { - dependencies = [ - sources."get-stream-6.0.1" - ]; - }) - sources."camelcase-7.0.1" - sources."chalk-5.3.0" - sources."chardet-0.7.0" - sources."ci-info-3.8.0" - sources."cli-boxes-3.0.0" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.1" - sources."cli-width-4.1.0" - sources."clone-1.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."conf-11.0.2" - (sources."config-chain-1.1.13" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - (sources."configstore-6.0.0" // { - dependencies = [ - sources."dot-prop-6.0.1" - ]; - }) - sources."cross-spawn-7.0.3" - (sources."crypto-random-string-4.0.0" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) - sources."data-uri-to-buffer-4.0.1" - sources."debounce-fn-5.1.2" - sources."debug-4.3.4" - (sources."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) - sources."deep-extend-0.6.0" - sources."defaults-1.0.4" - sources."defer-to-connect-2.0.1" - sources."degenerator-5.0.1" - sources."dot-prop-7.2.0" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-8.0.0" - sources."env-paths-3.0.0" - sources."escape-goat-4.0.0" - sources."escape-string-regexp-5.0.0" - sources."escodegen-2.1.0" - sources."esprima-4.0.1" - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."execa-8.0.1" - sources."external-editor-3.1.0" - sources."fast-deep-equal-3.1.3" - sources."fetch-blob-3.2.0" - sources."figures-5.0.0" - sources."form-data-encoder-2.1.4" - sources."formdata-polyfill-4.0.10" - sources."fs-extra-8.1.0" - sources."fuse.js-6.6.2" - sources."get-stream-8.0.1" - (sources."get-uri-6.0.1" // { - dependencies = [ - sources."data-uri-to-buffer-5.0.1" - ]; - }) - sources."global-dirs-3.0.1" - (sources."got-12.6.1" // { - dependencies = [ - sources."get-stream-6.0.1" - ]; - }) - sources."graceful-fs-4.2.11" - sources."has-flag-4.0.0" - sources."has-yarn-3.0.0" - sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-7.0.0" - sources."http2-wrapper-2.2.0" - sources."https-proxy-agent-7.0.2" - sources."human-signals-5.0.0" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."import-lazy-4.0.0" - sources."imurmurhash-0.1.4" - sources."inherits-2.0.4" - sources."ini-2.0.0" - (sources."inquirer-9.2.11" // { - dependencies = [ - sources."is-unicode-supported-0.1.0" - (sources."ora-5.4.1" // { - dependencies = [ - sources."chalk-4.1.2" - ]; - }) - ]; - }) - (sources."inquirer-autocomplete-prompt-3.0.0" // { - dependencies = [ - sources."ansi-escapes-6.2.0" - sources."run-async-2.4.1" - sources."type-fest-3.13.1" - ]; - }) - sources."ip-1.1.8" - sources."is-ci-3.0.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-installed-globally-0.4.0" - sources."is-interactive-1.0.0" - sources."is-npm-6.0.0" - sources."is-obj-2.0.0" - sources."is-path-inside-3.0.3" - sources."is-stream-3.0.0" - sources."is-typedarray-1.0.0" - sources."is-unicode-supported-1.3.0" - sources."is-yarn-global-0.4.1" - sources."isexe-2.0.0" - sources."json-buffer-3.0.1" - sources."json-schema-traverse-1.0.0" - sources."json-schema-typed-8.0.1" - sources."jsonfile-4.0.0" - sources."keyv-4.5.3" - sources."latest-version-7.0.0" - sources."lodash-4.17.21" - (sources."log-symbols-4.1.0" // { - dependencies = [ - sources."chalk-4.1.2" - sources."is-unicode-supported-0.1.0" - ]; - }) - sources."lowercase-keys-3.0.0" - sources."lru-cache-6.0.0" - sources."meow-12.1.1" - sources."merge-stream-2.0.0" - sources."mimic-fn-4.0.0" - sources."mimic-response-4.0.0" - sources."minimist-1.2.8" - sources."ms-2.1.2" - sources."mute-stream-1.0.0" - sources."netmask-2.0.2" - sources."node-domexception-1.0.0" - sources."node-fetch-3.3.2" - sources."normalize-url-8.0.0" - (sources."npm-run-path-5.1.0" // { - dependencies = [ - sources."path-key-4.0.0" - ]; - }) - sources."onetime-6.0.0" - (sources."ora-7.0.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."cli-cursor-4.0.0" - sources."emoji-regex-10.2.1" - sources."is-interactive-2.0.0" - sources."log-symbols-5.1.0" - sources."mimic-fn-2.1.0" - sources."onetime-5.1.2" - sources."restore-cursor-4.0.0" - sources."signal-exit-3.0.7" - sources."string-width-6.1.0" - sources."strip-ansi-7.1.0" - ]; - }) - sources."os-tmpdir-1.0.2" - sources."p-cancelable-3.0.0" - sources."pac-proxy-agent-7.0.1" - sources."pac-resolver-7.0.0" - sources."package-json-8.1.1" - sources."path-exists-5.0.0" - sources."path-key-3.1.1" - sources."picocolors-1.0.0" - sources."proto-list-1.2.4" - (sources."proxy-agent-6.3.1" // { - dependencies = [ - sources."lru-cache-7.18.3" - ]; - }) - sources."proxy-from-env-1.1.0" - sources."punycode-2.3.0" - sources."pupa-3.1.0" - sources."quick-lru-5.1.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - sources."readable-stream-3.6.2" - sources."registry-auth-token-5.0.2" - sources."registry-url-6.0.1" - sources."require-from-string-2.0.2" - sources."resolve-alpn-1.2.1" - sources."responselike-3.0.0" - (sources."restore-cursor-3.1.0" // { - dependencies = [ - sources."mimic-fn-2.1.0" - sources."onetime-5.1.2" - sources."signal-exit-3.0.7" - ]; - }) - sources."run-async-3.0.0" - sources."rxjs-7.8.1" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."semver-7.5.4" - sources."semver-diff-4.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."smart-buffer-4.2.0" - (sources."socks-2.7.1" // { - dependencies = [ - sources."ip-2.0.0" - ]; - }) - sources."socks-proxy-agent-8.0.2" - sources."source-map-0.6.1" - (sources."stdin-discarder-0.1.0" // { - dependencies = [ - sources."bl-5.1.0" - sources."buffer-6.0.3" - ]; - }) - sources."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-final-newline-3.0.0" - sources."strip-json-comments-2.0.1" - sources."stubborn-fs-1.2.5" - sources."supports-color-7.2.0" - sources."tmp-0.0.33" - sources."tslib-2.6.2" - sources."type-fest-2.19.0" - sources."typedarray-to-buffer-3.1.5" - sources."unique-string-3.0.0" - sources."universalify-0.1.2" - sources."update-notifier-6.0.2" - sources."uri-js-4.4.1" - sources."util-deprecate-1.0.2" - sources."validator-13.11.0" - sources."wcwidth-1.0.1" - sources."web-streams-polyfill-3.2.1" - sources."when-exit-2.1.1" - sources."which-2.0.2" - (sources."widest-line-4.0.1" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."wrap-ansi-6.2.0" - (sources."write-file-atomic-3.0.3" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) - sources."xdg-basedir-5.1.0" - sources."yallist-4.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A gitmoji client for using emojis on commit messages."; - homepage = "https://github.com/carloscuesta/gitmoji-cli#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; gramma = nodeEnv.buildNodePackage { name = "gramma"; packageName = "gramma"; -- cgit 1.4.1 From 52f53ba40fc0bf957f76daeceb406ef594d4d1c8 Mon Sep 17 00:00:00 2001 From: Robert Schütz Date: Sat, 23 Sep 2023 23:43:15 -0700 Subject: nodePackages.generator-code: drop It provides no executable and it is unclear how it would be used. --- pkgs/development/node-packages/aliases.nix | 1 + pkgs/development/node-packages/node-packages.json | 1 - pkgs/development/node-packages/node-packages.nix | 840 ---------------------- 3 files changed, 1 insertion(+), 841 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 6403ef4aaa9..7601196af5a 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -71,6 +71,7 @@ mapAliases { eslint_d = pkgs.eslint_d; # Added 2023-05-26 inherit (pkgs) firebase-tools; # added 2023-08-18 flood = pkgs.flood; # Added 2023-07-25 + generator-code = throw "generator-code was removed because it provides no executable"; # added 2023-09-24 git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21 glob = pkgs.node-glob; # added 2023-08-18 inherit (pkgs) gqlint; # added 2023-08-19 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 925e8b050da..db78aaee224 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -120,7 +120,6 @@ , "fx" , "ganache" , "gatsby-cli" -, "generator-code" , "get-graphql-schema" , "git-run" , "git-standup" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 72af9e92a6f..5abe9c5629f 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -78768,846 +78768,6 @@ in bypassCache = true; reconstructLock = true; }; - generator-code = nodeEnv.buildNodePackage { - name = "generator-code"; - packageName = "generator-code"; - version = "1.7.8"; - src = fetchurl { - url = "https://registry.npmjs.org/generator-code/-/generator-code-1.7.8.tgz"; - sha512 = "vaqIRIxCAkY9NBep8qacZqJjZKezSjEK6UilcwgsS4vCRkd9PqjxhH2NLWnFjrNGaxG0k0u4piyHtOwagd/mfQ=="; - }; - dependencies = [ - (sources."@babel/code-frame-7.22.13" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@babel/helper-validator-identifier-7.22.20" - (sources."@babel/highlight-7.22.20" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@gar/promisify-1.1.3" - (sources."@isaacs/cliui-8.0.2" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."@isaacs/string-locale-compare-1.1.0" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - (sources."@npmcli/arborist-4.3.1" // { - dependencies = [ - sources."@npmcli/fs-1.1.1" - sources."@npmcli/git-2.1.0" - sources."@npmcli/installed-package-contents-1.0.7" - sources."@npmcli/node-gyp-1.0.3" - sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-2.0.0" - sources."@tootallnate/once-1.1.2" - sources."brace-expansion-1.1.11" - sources."builtins-1.0.3" - sources."cacache-15.3.0" - sources."fs-minipass-2.1.0" - sources."glob-8.1.0" - sources."hosted-git-info-4.1.0" - sources."http-proxy-agent-4.0.1" - (sources."ignore-walk-4.0.1" // { - dependencies = [ - sources."minimatch-3.1.2" - ]; - }) - sources."json-parse-even-better-errors-2.3.1" - sources."lru-cache-6.0.0" - sources."make-fetch-happen-9.1.0" - sources."minimatch-5.1.6" - sources."minipass-3.3.6" - sources."minipass-fetch-1.4.1" - sources."node-gyp-8.4.1" - sources."nopt-5.0.0" - sources."npm-bundled-1.1.2" - sources."npm-install-checks-4.0.0" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.5" - (sources."npm-packlist-3.0.0" // { - dependencies = [ - sources."glob-7.2.3" - sources."minimatch-3.1.2" - ]; - }) - sources."npm-pick-manifest-6.1.1" - (sources."npm-registry-fetch-12.0.2" // { - dependencies = [ - sources."@npmcli/fs-2.1.2" - sources."@npmcli/move-file-2.0.1" - sources."@tootallnate/once-2.0.0" - sources."cacache-16.1.3" - sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.18.3" - (sources."make-fetch-happen-10.2.1" // { - dependencies = [ - sources."minipass-fetch-2.1.2" - ]; - }) - sources."socks-proxy-agent-7.0.0" - sources."ssri-9.0.1" - sources."unique-filename-2.0.1" - sources."unique-slug-3.0.0" - ]; - }) - sources."pacote-12.0.3" - sources."proc-log-1.0.0" - sources."read-package-json-fast-2.0.3" - sources."socks-proxy-agent-6.2.1" - sources."ssri-8.0.1" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - sources."validate-npm-package-name-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."@npmcli/fs-3.1.0" - sources."@npmcli/git-4.1.0" - sources."@npmcli/installed-package-contents-2.0.2" - (sources."@npmcli/map-workspaces-2.0.4" // { - dependencies = [ - sources."glob-8.1.0" - sources."json-parse-even-better-errors-2.3.1" - sources."minimatch-5.1.6" - sources."npm-normalize-package-bin-1.0.1" - sources."read-package-json-fast-2.0.3" - ]; - }) - (sources."@npmcli/metavuln-calculator-2.0.0" // { - dependencies = [ - sources."@npmcli/fs-1.1.1" - sources."@npmcli/git-2.1.0" - sources."@npmcli/installed-package-contents-1.0.7" - sources."@npmcli/move-file-2.0.1" - sources."@npmcli/node-gyp-1.0.3" - sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-2.0.0" - sources."@tootallnate/once-1.1.2" - sources."brace-expansion-1.1.11" - sources."builtins-1.0.3" - sources."cacache-15.3.0" - sources."fs-minipass-2.1.0" - (sources."glob-8.1.0" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-5.1.6" - ]; - }) - sources."hosted-git-info-4.1.0" - sources."http-proxy-agent-4.0.1" - sources."ignore-walk-4.0.1" - sources."json-parse-even-better-errors-2.3.1" - sources."lru-cache-6.0.0" - sources."make-fetch-happen-9.1.0" - sources."minimatch-3.1.2" - sources."minipass-3.3.6" - sources."minipass-fetch-1.4.1" - sources."node-gyp-8.4.1" - sources."nopt-5.0.0" - sources."npm-bundled-1.1.2" - sources."npm-install-checks-4.0.0" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.5" - sources."npm-packlist-3.0.0" - sources."npm-pick-manifest-6.1.1" - (sources."npm-registry-fetch-12.0.2" // { - dependencies = [ - sources."@npmcli/fs-2.1.2" - sources."@tootallnate/once-2.0.0" - sources."cacache-16.1.3" - sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.18.3" - (sources."make-fetch-happen-10.2.1" // { - dependencies = [ - sources."minipass-fetch-2.1.2" - ]; - }) - sources."socks-proxy-agent-7.0.0" - sources."ssri-9.0.1" - sources."unique-filename-2.0.1" - sources."unique-slug-3.0.0" - ]; - }) - sources."pacote-12.0.3" - sources."read-package-json-fast-2.0.3" - sources."socks-proxy-agent-6.2.1" - sources."ssri-8.0.1" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - sources."validate-npm-package-name-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."@npmcli/move-file-1.1.2" - sources."@npmcli/name-from-folder-1.0.1" - sources."@npmcli/node-gyp-3.0.0" - (sources."@npmcli/package-json-1.0.1" // { - dependencies = [ - sources."json-parse-even-better-errors-2.3.1" - ]; - }) - sources."@npmcli/promise-spawn-6.0.2" - sources."@npmcli/run-script-6.0.2" - sources."@octokit/auth-token-2.5.0" - sources."@octokit/core-3.6.0" - sources."@octokit/endpoint-6.0.12" - sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-12.11.0" - sources."@octokit/plugin-paginate-rest-2.21.3" - sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.16.2" - sources."@octokit/request-5.6.3" - sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.12.0" - sources."@octokit/types-6.41.0" - sources."@sigstore/bundle-1.1.0" - sources."@sigstore/protobuf-specs-0.2.1" - sources."@sigstore/sign-1.0.0" - sources."@sigstore/tuf-1.0.3" - sources."@tootallnate/once-2.0.0" - sources."@tufjs/canonical-json-1.0.0" - (sources."@tufjs/models-1.0.4" // { - dependencies = [ - sources."minimatch-9.0.3" - ]; - }) - sources."@types/expect-1.20.4" - sources."@types/minimatch-3.0.5" - sources."@types/node-15.14.9" - sources."@types/normalize-package-data-2.4.1" - sources."@types/vinyl-2.0.7" - sources."abbrev-1.1.1" - sources."abort-controller-3.0.0" - sources."agent-base-6.0.2" - sources."agentkeepalive-4.5.0" - sources."aggregate-error-3.1.0" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."aproba-2.0.0" - (sources."are-we-there-yet-3.0.1" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."argparse-1.0.10" - sources."array-differ-3.0.0" - sources."array-union-2.1.0" - sources."arrify-2.0.1" - sources."asap-2.0.6" - sources."async-3.2.4" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."before-after-hook-2.2.3" - (sources."bin-links-3.0.3" // { - dependencies = [ - sources."npm-normalize-package-bin-2.0.0" - ]; - }) - sources."binaryextensions-4.18.0" - (sources."bl-4.1.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."brace-expansion-2.0.1" - sources."braces-3.0.2" - sources."buffer-5.7.1" - sources."builtins-5.0.1" - (sources."cacache-17.1.4" // { - dependencies = [ - sources."glob-10.3.4" - sources."minimatch-9.0.3" - sources."minipass-7.0.3" - ]; - }) - sources."chalk-4.1.2" - sources."chardet-0.7.0" - sources."chownr-2.0.0" - sources."clean-stack-2.2.0" - sources."cli-boxes-1.0.0" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.1" - sources."cli-table-0.3.11" - sources."cli-width-3.0.0" - sources."clone-2.1.2" - sources."clone-buffer-1.0.0" - sources."clone-stats-1.0.0" - sources."cloneable-readable-1.1.3" - sources."cmd-shim-5.0.0" - sources."code-point-at-1.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."colors-1.0.3" - sources."commander-7.1.0" - sources."common-ancestor-path-1.0.1" - sources."commondir-1.0.1" - sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.3" - (sources."cross-spawn-7.0.3" // { - dependencies = [ - sources."which-2.0.2" - ]; - }) - sources."dargs-7.0.0" - sources."dateformat-4.6.3" - sources."debug-4.3.4" - sources."debuglog-1.0.1" - sources."deep-extend-0.6.0" - (sources."defaults-1.0.4" // { - dependencies = [ - sources."clone-1.0.4" - ]; - }) - sources."delegates-1.0.0" - sources."deprecation-2.3.1" - sources."dezalgo-1.0.4" - sources."diff-5.1.0" - sources."dir-glob-3.0.1" - sources."eastasianwidth-0.2.0" - sources."ejs-3.1.9" - sources."emoji-regex-8.0.0" - sources."encoding-0.1.13" - sources."env-paths-2.2.1" - sources."err-code-2.0.3" - sources."error-10.4.0" - sources."error-ex-1.3.2" - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - sources."event-target-shim-5.0.1" - sources."eventemitter3-4.0.7" - sources."events-3.3.0" - sources."execa-5.1.1" - sources."exponential-backoff-3.1.1" - (sources."external-editor-3.1.0" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) - sources."fast-glob-3.3.1" - sources."fast-plist-0.1.3" - sources."fastq-1.15.0" - sources."figures-3.2.0" - (sources."filelist-1.0.4" // { - dependencies = [ - sources."minimatch-5.1.6" - ]; - }) - sources."fill-range-7.0.1" - sources."find-up-4.1.0" - sources."find-yarn-workspace-root2-1.2.16" - sources."first-chunk-stream-2.0.0" - (sources."foreground-child-3.1.1" // { - dependencies = [ - sources."signal-exit-4.1.0" - ]; - }) - (sources."fs-minipass-3.0.3" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."gauge-4.0.4" - sources."get-stdin-4.0.1" - sources."get-stream-6.0.1" - sources."github-username-6.0.0" - (sources."glob-7.2.3" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."minimatch-3.1.2" - ]; - }) - sources."glob-parent-5.1.2" - sources."globby-11.1.0" - sources."graceful-fs-4.2.11" - sources."grouped-queue-2.0.0" - sources."has-1.0.3" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."has-flag-4.0.0" - sources."has-unicode-2.0.1" - sources."hosted-git-info-6.1.1" - sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.1" - sources."human-signals-2.1.0" - sources."humanize-ms-1.2.1" - sources."iconv-lite-0.6.3" - sources."ieee754-1.2.1" - sources."ignore-5.2.4" - (sources."ignore-walk-6.0.3" // { - dependencies = [ - sources."minimatch-9.0.3" - ]; - }) - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."infer-owner-1.0.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - (sources."inquirer-8.2.6" // { - dependencies = [ - sources."wrap-ansi-6.2.0" - ]; - }) - sources."interpret-1.4.0" - sources."ip-2.0.0" - sources."is-arrayish-0.2.1" - sources."is-core-module-2.13.0" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-interactive-1.0.0" - sources."is-lambda-1.0.1" - sources."is-number-7.0.0" - sources."is-plain-obj-2.1.0" - sources."is-plain-object-5.0.0" - sources."is-scoped-2.1.0" - sources."is-stream-2.0.1" - sources."is-unicode-supported-0.1.0" - sources."is-utf8-0.2.1" - sources."isarray-1.0.0" - sources."isbinaryfile-5.0.0" - sources."isexe-2.0.0" - sources."jackspeak-2.3.3" - (sources."jake-10.8.7" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."minimatch-3.1.2" - ]; - }) - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."json-parse-even-better-errors-3.0.0" - sources."json-stringify-nice-1.1.4" - sources."jsonparse-1.3.1" - sources."just-diff-5.2.0" - sources."just-diff-apply-5.5.0" - sources."lines-and-columns-1.2.4" - (sources."load-yaml-file-0.2.0" // { - dependencies = [ - sources."pify-4.0.1" - sources."strip-bom-3.0.0" - ]; - }) - sources."locate-path-5.0.0" - sources."lodash-4.17.21" - sources."log-symbols-4.1.0" - sources."lru-cache-7.18.3" - sources."make-fetch-happen-11.1.1" - sources."mem-fs-2.3.0" - sources."mem-fs-editor-9.7.0" - sources."merge-stream-2.0.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.5" - sources."mimic-fn-2.1.0" - sources."minimatch-7.4.6" - sources."minimist-1.2.8" - sources."minipass-5.0.0" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-fetch-3.0.4" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-json-stream-1.0.1" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minipass-sized-1.0.3" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."mkdirp-1.0.4" - sources."mkdirp-infer-owner-2.0.0" - sources."ms-2.1.2" - (sources."multimatch-5.0.0" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."minimatch-3.1.2" - ]; - }) - sources."mute-stream-0.0.8" - sources."negotiator-0.6.3" - sources."node-fetch-2.7.0" - (sources."node-gyp-9.4.0" // { - dependencies = [ - sources."which-2.0.2" - ]; - }) - sources."nopt-6.0.0" - sources."normalize-package-data-5.0.0" - sources."normalize-path-3.0.0" - sources."npm-bundled-3.0.0" - sources."npm-install-checks-6.2.0" - sources."npm-normalize-package-bin-3.0.1" - sources."npm-package-arg-10.1.0" - sources."npm-packlist-7.0.4" - sources."npm-pick-manifest-8.0.2" - sources."npm-registry-fetch-14.0.5" - sources."npm-run-path-4.0.1" - sources."npmlog-6.0.2" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."ora-5.4.1" - sources."os-tmpdir-1.0.2" - sources."p-finally-1.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-map-4.0.0" - sources."p-queue-6.6.2" - sources."p-timeout-3.2.0" - sources."p-transform-1.3.0" - sources."p-try-2.2.0" - sources."pacote-15.2.0" - sources."pad-component-0.0.1" - (sources."parse-conflict-json-2.0.2" // { - dependencies = [ - sources."json-parse-even-better-errors-2.3.1" - ]; - }) - (sources."parse-json-5.2.0" // { - dependencies = [ - sources."json-parse-even-better-errors-2.3.1" - ]; - }) - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."lru-cache-10.0.1" - ]; - }) - sources."path-type-4.0.0" - sources."picomatch-2.3.1" - sources."pify-2.3.0" - sources."pkg-dir-4.2.0" - (sources."preferred-pm-3.1.2" // { - dependencies = [ - sources."find-up-5.0.0" - sources."locate-path-6.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - ]; - }) - sources."pretty-bytes-5.6.0" - sources."proc-log-3.0.0" - sources."process-0.11.10" - sources."process-nextick-args-2.0.1" - sources."promise-all-reject-late-1.0.1" - sources."promise-call-limit-1.0.2" - sources."promise-inflight-1.0.1" - sources."promise-retry-2.0.1" - sources."queue-microtask-1.2.3" - sources."read-cmd-shim-3.0.1" - (sources."read-package-json-6.0.4" // { - dependencies = [ - sources."glob-10.3.4" - sources."minimatch-9.0.3" - ]; - }) - sources."read-package-json-fast-3.0.2" - (sources."read-pkg-5.2.0" // { - dependencies = [ - sources."hosted-git-info-2.8.9" - sources."normalize-package-data-2.5.0" - sources."semver-5.7.2" - sources."type-fest-0.6.0" - ]; - }) - sources."read-pkg-up-7.0.1" - sources."readable-stream-2.3.8" - sources."readdir-scoped-modules-1.1.0" - sources."rechoir-0.6.2" - sources."remove-trailing-separator-1.1.0" - sources."replace-ext-1.0.1" - sources."request-light-0.7.0" - sources."resolve-1.22.6" - sources."restore-cursor-3.1.0" - sources."retry-0.12.0" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."run-async-2.4.1" - sources."run-parallel-1.2.0" - sources."rxjs-7.8.1" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."sanitize-filename-1.6.3" - sources."scoped-regex-2.1.0" - (sources."semver-7.5.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - sources."set-blocking-2.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."shelljs-0.8.5" - sources."signal-exit-3.0.7" - sources."sigstore-1.9.0" - sources."slash-3.0.0" - sources."smart-buffer-4.2.0" - sources."socks-2.7.1" - sources."socks-proxy-agent-7.0.0" - sources."sort-keys-4.2.0" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.15" - sources."sprintf-js-1.0.3" - (sources."ssri-10.0.5" // { - dependencies = [ - sources."minipass-7.0.3" - ]; - }) - sources."string-width-4.2.3" - sources."string-width-cjs-4.2.3" - sources."string_decoder-1.1.1" - sources."strip-ansi-6.0.1" - sources."strip-ansi-cjs-6.0.1" - sources."strip-bom-2.0.0" - sources."strip-bom-buf-1.0.0" - sources."strip-bom-stream-2.0.0" - sources."strip-final-newline-2.0.0" - sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."taketalk-1.0.0" - (sources."tar-6.2.0" // { - dependencies = [ - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - ]; - }) - sources."text-table-0.2.0" - sources."textextensions-5.16.0" - sources."through-2.3.8" - sources."tmp-0.0.33" - sources."to-regex-range-5.0.1" - sources."tr46-0.0.3" - sources."treeverse-1.0.4" - sources."truncate-utf8-bytes-1.0.2" - sources."tslib-2.6.2" - sources."tuf-js-1.1.7" - sources."type-fest-0.8.1" - sources."unique-filename-3.0.0" - sources."unique-slug-4.0.0" - sources."universal-user-agent-6.0.0" - sources."untildify-4.0.0" - sources."utf8-byte-length-1.0.4" - sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" - sources."validate-npm-package-name-5.0.0" - sources."vinyl-2.2.1" - sources."vinyl-file-3.0.0" - sources."walk-up-path-1.0.0" - sources."wcwidth-1.0.1" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."which-3.0.1" - sources."which-pm-2.0.0" - sources."wide-align-1.1.5" - (sources."wrap-ansi-8.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."ansi-styles-6.2.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - ]; - }) - sources."wrap-ansi-cjs-7.0.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-4.0.2" - sources."yallist-4.0.0" - (sources."yeoman-environment-3.19.3" // { - dependencies = [ - sources."@npmcli/fs-1.1.1" - sources."@npmcli/git-2.1.0" - sources."@npmcli/installed-package-contents-1.0.7" - sources."@npmcli/move-file-2.0.1" - sources."@npmcli/node-gyp-1.0.3" - sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-2.0.0" - sources."@tootallnate/once-1.1.2" - (sources."are-we-there-yet-2.0.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."brace-expansion-1.1.11" - sources."buffer-6.0.3" - sources."builtins-1.0.3" - sources."cacache-15.3.0" - sources."escape-string-regexp-4.0.0" - sources."find-up-5.0.0" - sources."fs-minipass-2.1.0" - sources."gauge-3.0.2" - (sources."glob-8.1.0" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-5.1.6" - ]; - }) - sources."hosted-git-info-4.1.0" - sources."http-proxy-agent-4.0.1" - sources."ignore-walk-4.0.1" - sources."isbinaryfile-4.0.10" - sources."json-parse-even-better-errors-2.3.1" - sources."locate-path-6.0.0" - sources."lru-cache-6.0.0" - sources."make-fetch-happen-9.1.0" - sources."minimatch-3.1.2" - sources."minipass-3.3.6" - sources."minipass-fetch-1.4.1" - (sources."node-gyp-8.4.1" // { - dependencies = [ - sources."are-we-there-yet-3.0.1" - sources."gauge-4.0.4" - sources."npmlog-6.0.2" - sources."readable-stream-3.6.2" - ]; - }) - sources."nopt-5.0.0" - sources."npm-bundled-1.1.2" - sources."npm-install-checks-4.0.0" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.5" - sources."npm-packlist-3.0.0" - sources."npm-pick-manifest-6.1.1" - (sources."npm-registry-fetch-12.0.2" // { - dependencies = [ - sources."@npmcli/fs-2.1.2" - sources."@tootallnate/once-2.0.0" - sources."cacache-16.1.3" - sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.18.3" - (sources."make-fetch-happen-10.2.1" // { - dependencies = [ - sources."minipass-fetch-2.1.2" - ]; - }) - sources."socks-proxy-agent-7.0.0" - sources."ssri-9.0.1" - sources."unique-filename-2.0.1" - sources."unique-slug-3.0.0" - ]; - }) - sources."npmlog-5.0.1" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."pacote-12.0.3" - sources."read-package-json-fast-2.0.3" - sources."readable-stream-4.4.2" - sources."safe-buffer-5.2.1" - sources."socks-proxy-agent-6.2.1" - sources."ssri-8.0.1" - sources."string_decoder-1.3.0" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - sources."validate-npm-package-name-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."yeoman-generator-5.9.0" - sources."yocto-queue-0.1.0" - (sources."yosay-2.0.2" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.1" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."ansi-styles-2.2.1" - ]; - }) - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."is-fullwidth-code-point-2.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.1" - sources."strip-ansi-4.0.0" - ]; - }) - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - (sources."wrap-ansi-2.1.0" // { - dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - ]; - }) - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Yeoman generator for Visual Studio Code extensions."; - homepage = "http://code.visualstudio.com"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; get-graphql-schema = nodeEnv.buildNodePackage { name = "get-graphql-schema"; packageName = "get-graphql-schema"; -- cgit 1.4.1 From 4560afb3fdec2f9a37286b1825ff208b219ee0b1 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Mon, 25 Sep 2023 10:27:49 +1000 Subject: rectangle-pro: 3.0.9 -> 3.0.11 --- pkgs/by-name/re/rectangle-pro/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/rectangle-pro/package.nix b/pkgs/by-name/re/rectangle-pro/package.nix index 26b39da655e..710ec7121c9 100644 --- a/pkgs/by-name/re/rectangle-pro/package.nix +++ b/pkgs/by-name/re/rectangle-pro/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "rectangle-pro"; - version = "3.0.9"; + version = "3.0.11"; src = fetchurl { url = "https://rectangleapp.com/pro/downloads/Rectangle%20Pro%20${finalAttrs.version}.dmg"; - hash = "sha256-wD8yi2Pbgrn1fW/xrocepDcpzSMsQH5yjB/Jv90PuGQ="; + hash = "sha256-Hs2eRO5DpYoY0rLfcmGZRHjmg+wddz/+LE0u4E9gCTk="; }; sourceRoot = "."; -- cgit 1.4.1 From 94a42157f48abfe2c27b1afadd3bf8f94334f08d Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Sun, 17 Sep 2023 00:13:07 -0700 Subject: nixos/xonotic: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/games/xonotic.nix | 198 +++++++++++++++++++++++++++++++ 2 files changed, 199 insertions(+) create mode 100644 nixos/modules/services/games/xonotic.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7744bbd76e6..206d5eaf75d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -499,6 +499,7 @@ ./services/games/quake3-server.nix ./services/games/teeworlds.nix ./services/games/terraria.nix + ./services/games/xonotic.nix ./services/hardware/acpid.nix ./services/hardware/actkbd.nix ./services/hardware/argonone.nix diff --git a/nixos/modules/services/games/xonotic.nix b/nixos/modules/services/games/xonotic.nix new file mode 100644 index 00000000000..c84347ddc98 --- /dev/null +++ b/nixos/modules/services/games/xonotic.nix @@ -0,0 +1,198 @@ +{ config +, pkgs +, lib +, ... +}: + +let + cfg = config.services.xonotic; + + serverCfg = pkgs.writeText "xonotic-server.cfg" ( + toString cfg.prependConfig + + "\n" + + builtins.concatStringsSep "\n" ( + lib.mapAttrsToList (key: option: + let + escape = s: lib.escape [ "\"" ] s; + quote = s: "\"${s}\""; + + toValue = x: quote (escape (toString x)); + + value = (if lib.isList option then + builtins.concatStringsSep + " " + (builtins.map (x: toValue x) option) + else + toValue option + ); + in + "${key} ${value}" + ) cfg.settings + ) + + "\n" + + toString cfg.appendConfig + ); +in + +{ + options.services.xonotic = { + enable = lib.mkEnableOption (lib.mdDoc "Xonotic dedicated server"); + + package = lib.mkPackageOption pkgs "xonotic-dedicated" {}; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc '' + Open the firewall for TCP and UDP on the specified port. + ''; + }; + + dataDir = lib.mkOption { + type = lib.types.path; + readOnly = true; + default = "/var/lib/xonotic"; + description = lib.mdDoc '' + Data directory. + ''; + }; + + settings = lib.mkOption { + description = lib.mdDoc '' + Generates the `server.cfg` file. Refer to [upstream's example][0] for + details. + + [0]: https://gitlab.com/xonotic/xonotic/-/blob/master/server/server.cfg + ''; + default = {}; + type = lib.types.submodule { + freeformType = with lib.types; let + scalars = oneOf [ singleLineStr int float ]; + in + attrsOf (oneOf [ scalars (nonEmptyListOf scalars) ]); + + options.sv_public = lib.mkOption { + type = lib.types.int; + default = 0; + example = [ (-1) 1 ]; + description = lib.mdDoc '' + Controls whether the server will be publicly listed. + ''; + }; + + options.hostname = lib.mkOption { + type = lib.types.singleLineStr; + default = "Xonotic $g_xonoticversion Server"; + description = lib.mdDoc '' + The name that will appear in the server list. `$g_xonoticversion` + gets replaced with the current version. + ''; + }; + + options.sv_motd = lib.mkOption { + type = lib.types.singleLineStr; + default = ""; + description = lib.mdDoc '' + Text displayed when players join the server. + ''; + }; + + options.sv_termsofservice_url = lib.mkOption { + type = lib.types.singleLineStr; + default = ""; + description = lib.mdDoc '' + URL for the Terms of Service for playing on your server. + ''; + }; + + options.maxplayers = lib.mkOption { + type = lib.types.int; + default = 16; + description = lib.mdDoc '' + Number of player slots on the server, including spectators. + ''; + }; + + options.net_address = lib.mkOption { + type = lib.types.singleLineStr; + default = "0.0.0.0"; + description = lib.mdDoc '' + The address Xonotic will listen on. + ''; + }; + + options.port = lib.mkOption { + type = lib.types.port; + default = 26000; + description = lib.mdDoc '' + The port Xonotic will listen on. + ''; + }; + }; + }; + + # Still useful even though we're using RFC 42 settings because *some* keys + # can be repeated. + appendConfig = lib.mkOption { + type = with lib.types; nullOr lines; + default = null; + description = lib.mdDoc '' + Literal text to insert at the end of `server.cfg`. + ''; + }; + + # Certain changes need to happen at the beginning of the file. + prependConfig = lib.mkOption { + type = with lib.types; nullOr lines; + default = null; + description = lib.mdDoc '' + Literal text to insert at the start of `server.cfg`. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.xonotic = { + description = "Xonotic server"; + wantedBy = [ "multi-user.target" ]; + + environment = { + # Required or else it tries to write the lock file into the nix store + HOME = cfg.dataDir; + }; + + serviceConfig = { + DynamicUser = true; + User = "xonotic"; + StateDirectory = "xonotic"; + ExecStart = "${cfg.package}/bin/xonotic-dedicated"; + + # Symlink the configuration from the nix store to where Xonotic actually + # looks for it + ExecStartPre = [ + "${pkgs.coreutils}/bin/mkdir -p ${cfg.dataDir}/.xonotic/data" + '' + ${pkgs.coreutils}/bin/ln -sf ${serverCfg} \ + ${cfg.dataDir}/.xonotic/data/server.cfg + '' + ]; + + # Cargo-culted from search results about writing Xonotic systemd units + ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID"; + + Restart = "on-failure"; + RestartSec = 10; + StartLimitBurst = 5; + }; + }; + + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ + cfg.settings.port + ]; + networking.firewall.allowedUDPPorts = lib.mkIf cfg.openFirewall [ + cfg.settings.port + ]; + }; + + meta.maintainers = with lib.maintainers; [ CobaltCause ]; +} -- cgit 1.4.1 From 0a017f947fc9a060bfdd79a8e885f1d54fd8a592 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Sep 2023 05:01:34 +0000 Subject: ppsspp-sdl: 1.16.1 -> 1.16.2 --- pkgs/applications/emulators/ppsspp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix index 94a04de14c9..bdca27eec69 100644 --- a/pkgs/applications/emulators/ppsspp/default.nix +++ b/pkgs/applications/emulators/ppsspp/default.nix @@ -34,14 +34,14 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString enableQt "-qt" + lib.optionalString (!enableQt) "-sdl" + lib.optionalString forceWayland "-wayland"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-bKRb7a5lEfE1uUeVl7i1He3qLJ4wI5HmKmWAk2oKdYI="; + sha256 = "sha256-Ygi7ioLOBQbD+QTD7pO2hIATV8HUDyrdhw7gBSSiHmc="; }; postPatch = '' -- cgit 1.4.1 From aa54e0d65df183b8914adf7c2db543055e060ecf Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 24 Sep 2023 12:21:40 +0100 Subject: inetutils: add patch for CVE-2023-40303 --- pkgs/tools/networking/inetutils/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 0f31ef01cf2..468cdf2e04e 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, fetchurl, ncurses, perl, help2man +{ stdenv +, lib +, fetchurl +, fetchpatch +, ncurses +, perl +, help2man , apparmorRulesFromClosure , libxcrypt }: @@ -17,6 +23,11 @@ stdenv.mkDerivation rec { patches = [ # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 ./inetutils-1_9-PATH_PROCNET_DEV.patch + (fetchpatch { + name = "CVE-2023-40303.patch"; + url = "https://git.savannah.gnu.org/cgit/inetutils.git/patch/?id=e4e65c03f4c11292a3e40ef72ca3f194c8bffdd6"; + hash = "sha256-I5skN537owfpFpAZr4vDKPHuERI6+oq5/hFW2RQeUxI="; + }) ]; strictDeps = true; -- cgit 1.4.1 From cc841fa4302161b7e76f496686242f7d152fbcec Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 24 Sep 2023 14:21:28 +0100 Subject: inetutils: enable tests --- pkgs/tools/networking/inetutils/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 468cdf2e04e..e4eb2eeaac4 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -51,9 +51,7 @@ stdenv.mkDerivation rec { "--disable-rexec" ] ++ lib.optional stdenv.isDarwin "--disable-servers"; - # Test fails with "UNIX socket name too long", probably because our - # $TMPDIR is too long. - doCheck = false; + doCheck = true; installFlags = [ "SUIDMODE=" ]; -- cgit 1.4.1