Unverified Commit 77596305 authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #250483 from dotlambda/ungit-buildNpmPackage

ungit: use buildNpmPackage
parents a4b7b58a aff2ef70
Loading
Loading
Loading
Loading
+32 −0
Original line number Diff line number Diff line
{ lib
, buildNpmPackage
, fetchFromGitHub
}:

buildNpmPackage rec {
  pname = "ungit";
  version = "1.5.24";

  src = fetchFromGitHub {
    owner = "FredrikNoren";
    repo = "ungit";
    rev = "v${version}";
    hash = "sha256-4hDg153CVZidmnIGUwxfzL45Yt+GlMyepfMLJbcjdqo=";
  };

  npmDepsHash = "sha256-Z/vPqJ70NqjABKKa8r24t0sWoPYRVwxH02BNr1yCVNQ=";

  env = {
    ELECTRON_SKIP_BINARY_DOWNLOAD = true;
    PUPPETEER_SKIP_DOWNLOAD = true;
  };

  meta = {
    changelog = "https://github.com/FredrikNoren/ungit/blob/${src.rev}/CHANGELOG.md";
    description = "Git made easy";
    homepage = "https://github.com/FredrikNoren/ungit";
    license = lib.licenses.mit;
    mainProgram = "ungit";
    maintainers = with lib.maintainers; [ ];
  };
}
+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ mapAliases {
  thelounge = pkgs.thelounge; # Added 2023-05-22
  triton = pkgs.triton; # Added 2023-05-06
  typescript = pkgs.typescript; # Added 2023-06-21
  inherit (pkgs) ungit; # added 2023-08-20
  vscode-langservers-extracted = pkgs.vscode-langservers-extracted; # Added 2023-05-27
  vue-cli = self."@vue/cli"; # added 2023-08-18
  inherit (pkgs) yo; # added 2023-08-20
+0 −1
Original line number Diff line number Diff line
@@ -346,7 +346,6 @@
, "typescript-language-server"
, "uglify-js"
, "undollar"
, "ungit"
, "unified-language-server"
, "vega-cli"
, "vega-lite"
+0 −489
Original line number Diff line number Diff line
@@ -137186,495 +137186,6 @@ in
    bypassCache = true;
    reconstructLock = true;
  };
  ungit = nodeEnv.buildNodePackage {
    name = "ungit";
    packageName = "ungit";
    version = "1.5.23";
    src = fetchurl {
      url = "https://registry.npmjs.org/ungit/-/ungit-1.5.23.tgz";
      sha512 = "3FJW6C12Cn71UiRPTUKmyUYy4qPrJjY7El8bEMqOvakn6knHMuPuM7ijOiNGm7nfKdsRY95gR7pDveqULd367w==";
    };
    dependencies = [
      sources."@colors/colors-1.5.0"
      sources."@dabh/diagnostics-2.0.3"
      sources."@pnpm/config.env-replace-1.1.0"
      sources."@pnpm/network.ca-file-1.0.2"
      sources."@pnpm/npm-conf-2.2.2"
      sources."@primer/octicons-17.10.2"
      sources."@sindresorhus/is-5.6.0"
      sources."@socket.io/component-emitter-3.1.0"
      sources."@szmarczak/http-timer-5.0.1"
      sources."@types/cookie-0.4.1"
      sources."@types/cors-2.8.13"
      sources."@types/http-cache-semantics-4.0.1"
      sources."@types/node-16.18.40"
      sources."@types/triple-beam-1.3.2"
      sources."JSONStream-1.3.5"
      sources."abbrev-1.1.1"
      sources."accepts-1.3.8"
      sources."acorn-7.4.1"
      sources."acorn-node-1.8.2"
      sources."acorn-walk-7.2.0"
      sources."ansi-regex-5.0.1"
      (sources."ansi-styles-4.3.0" // {
        dependencies = [
          sources."color-convert-2.0.1"
          sources."color-name-1.1.4"
        ];
      })
      sources."any-promise-1.3.0"
      sources."array-flatten-1.1.1"
      (sources."asn1.js-5.4.1" // {
        dependencies = [
          sources."bn.js-4.12.0"
        ];
      })
      (sources."assert-1.5.0" // {
        dependencies = [
          sources."inherits-2.0.1"
          sources."util-0.10.3"
        ];
      })
      sources."async-3.2.4"
      sources."available-typed-arrays-1.0.5"
      sources."balanced-match-1.0.2"
      sources."base64-js-1.5.1"
      sources."base64id-2.0.0"
      sources."blueimp-md5-2.19.0"
      sources."bn.js-5.2.1"
      sources."body-parser-1.20.2"
      sources."bootstrap-3.4.1"
      sources."brace-expansion-1.1.11"
      sources."brorand-1.1.0"
      sources."browser-pack-6.1.0"
      sources."browser-resolve-2.0.0"
      sources."browserify-17.0.0"
      sources."browserify-aes-1.2.0"
      sources."browserify-cipher-1.0.1"
      sources."browserify-des-1.0.2"
      sources."browserify-rsa-4.1.0"
      (sources."browserify-sign-4.2.1" // {
        dependencies = [
          sources."readable-stream-3.6.2"
        ];
      })
      sources."browserify-zlib-0.2.0"
      sources."buffer-5.2.1"
      sources."buffer-from-1.1.2"
      sources."buffer-xor-1.0.3"
      sources."bufferutil-4.0.7"
      sources."builtin-status-codes-3.0.0"
      sources."bytes-3.1.2"
      sources."cacheable-lookup-7.0.0"
      sources."cacheable-request-10.2.13"
      sources."cached-path-relative-1.1.0"
      sources."call-bind-1.0.2"
      sources."cipher-base-1.0.4"
      sources."cliui-8.0.1"
      sources."clone-2.1.2"
      sources."color-3.2.1"
      sources."color-convert-1.9.3"
      sources."color-name-1.1.3"
      sources."color-string-1.9.1"
      sources."colorspace-1.1.4"
      (sources."combine-source-map-0.8.0" // {
        dependencies = [
          sources."convert-source-map-1.1.3"
        ];
      })
      sources."concat-map-0.0.1"
      sources."concat-stream-1.6.2"
      sources."config-chain-1.1.13"
      sources."console-browserify-1.2.0"
      sources."constants-browserify-1.0.0"
      sources."content-disposition-0.5.4"
      sources."content-type-1.0.5"
      sources."convert-source-map-1.9.0"
      sources."cookie-0.4.1"
      sources."cookie-parser-1.4.6"
      sources."cookie-signature-1.0.6"
      sources."core-util-is-1.0.3"
      sources."cors-2.8.5"
      (sources."create-ecdh-4.0.4" // {
        dependencies = [
          sources."bn.js-4.12.0"
        ];
      })
      sources."create-hash-1.2.0"
      sources."create-hmac-1.1.7"
      sources."crossroads-0.12.2"
      sources."crypto-browserify-3.12.0"
      sources."dash-ast-1.0.0"
      sources."debug-2.6.9"
      (sources."decompress-response-6.0.0" // {
        dependencies = [
          sources."mimic-response-3.1.0"
        ];
      })
      sources."deep-extend-0.6.0"
      sources."defer-to-connect-2.0.1"
      sources."define-lazy-prop-2.0.0"
      sources."defined-1.0.1"
      sources."depd-2.0.0"
      sources."deps-sort-2.0.1"
      sources."des.js-1.1.0"
      sources."destroy-1.2.0"
      sources."detective-5.2.1"
      sources."diff-5.1.0"
      sources."diff2html-3.4.40"
      (sources."diffie-hellman-5.0.3" // {
        dependencies = [
          sources."bn.js-4.12.0"
        ];
      })
      sources."dnd-page-scroll-0.0.4"
      sources."domain-browser-1.2.0"
      sources."duplexer2-0.1.4"
      sources."ee-first-1.1.1"
      (sources."elliptic-6.5.4" // {
        dependencies = [
          sources."bn.js-4.12.0"
        ];
      })
      sources."emoji-regex-8.0.0"
      sources."enabled-2.0.0"
      sources."encodeurl-1.0.2"
      (sources."engine.io-6.2.1" // {
        dependencies = [
          sources."debug-4.3.4"
          sources."ms-2.1.2"
        ];
      })
      sources."engine.io-parser-5.0.7"
      sources."error-ex-1.3.2"
      sources."escalade-3.1.1"
      sources."escape-html-1.0.3"
      sources."etag-1.8.1"
      sources."eve-0.5.4"
      sources."events-3.3.0"
      sources."evp_bytestokey-1.0.3"
      (sources."express-4.18.2" // {
        dependencies = [
          sources."body-parser-1.20.1"
          sources."cookie-0.5.0"
          sources."raw-body-2.5.1"
        ];
      })
      (sources."express-session-1.17.3" // {
        dependencies = [
          sources."cookie-0.4.2"
        ];
      })
      sources."fast-safe-stringify-2.1.1"
      sources."fecha-4.2.3"
      sources."finalhandler-1.2.0"
      sources."fn.name-1.1.0"
      sources."for-each-0.3.3"
      sources."form-data-encoder-2.1.4"
      sources."forwarded-0.2.0"
      sources."fresh-0.5.2"
      sources."fs.realpath-1.0.0"
      sources."function-bind-1.1.1"
      sources."get-assigned-identifiers-1.2.0"
      sources."get-caller-file-2.0.5"
      sources."get-intrinsic-1.2.1"
      sources."get-stream-6.0.1"
      sources."getmac-5.20.0"
      sources."glob-7.2.3"
      sources."gopd-1.0.1"
      sources."got-12.6.1"
      sources."graceful-fs-4.2.10"
      sources."has-1.0.3"
      sources."has-proto-1.0.1"
      sources."has-symbols-1.0.3"
      sources."has-tostringtag-1.0.0"
      (sources."hash-base-3.1.0" // {
        dependencies = [
          sources."readable-stream-3.6.2"
        ];
      })
      sources."hash.js-1.1.7"
      sources."hasher-1.2.0"
      sources."hmac-drbg-1.0.1"
      (sources."hogan.js-3.0.2" // {
        dependencies = [
          sources."mkdirp-0.3.0"
        ];
      })
      sources."htmlescape-1.1.1"
      sources."http-cache-semantics-4.1.1"
      sources."http-errors-2.0.0"
      sources."http2-wrapper-2.2.0"
      sources."https-browserify-1.0.0"
      sources."iconv-lite-0.4.24"
      sources."ieee754-1.2.1"
      sources."ignore-5.2.4"
      sources."inflight-1.0.6"
      sources."inherits-2.0.4"
      sources."ini-1.3.8"
      sources."inline-source-map-0.6.2"
      sources."insert-module-globals-7.2.1"
      sources."ipaddr.js-1.9.1"
      sources."is-arguments-1.1.1"
      sources."is-arrayish-0.2.1"
      sources."is-buffer-1.1.6"
      sources."is-callable-1.2.7"
      sources."is-core-module-2.13.0"
      sources."is-docker-2.2.1"
      sources."is-fullwidth-code-point-3.0.0"
      sources."is-generator-function-1.0.10"
      sources."is-stream-2.0.1"
      sources."is-typed-array-1.1.12"
      sources."is-utf8-0.2.1"
      sources."is-wsl-2.2.0"
      sources."isarray-1.0.0"
      sources."jquery-3.6.4"
      sources."jquery-ui-1.13.2"
      sources."json-buffer-3.0.1"
      sources."jsonparse-1.3.1"
      sources."just-detect-adblock-1.1.0"
      sources."keyv-4.5.3"
      sources."knockout-3.5.1"
      sources."kuler-2.0.0"
      sources."labeled-stream-splicer-2.0.2"
      sources."latest-version-7.0.0"
      sources."lodash-4.17.21"
      sources."lodash.memoize-3.0.4"
      (sources."logform-2.5.1" // {
        dependencies = [
          sources."ms-2.1.3"
        ];
      })
      sources."lowercase-keys-3.0.0"
      sources."lru-cache-4.1.5"
      sources."md5.js-1.3.5"
      sources."media-typer-0.3.0"
      (sources."memorystore-1.6.7" // {
        dependencies = [
          sources."debug-4.3.4"
          sources."ms-2.1.2"
        ];
      })
      sources."merge-descriptors-1.0.1"
      sources."methods-1.1.2"
      (sources."miller-rabin-4.0.1" // {
        dependencies = [
          sources."bn.js-4.12.0"
        ];
      })
      sources."mime-1.6.0"
      sources."mime-db-1.52.0"
      sources."mime-types-2.1.35"
      sources."mimic-response-4.0.0"
      sources."minimalistic-assert-1.0.1"
      sources."minimalistic-crypto-utils-1.0.1"
      sources."minimatch-3.1.2"
      sources."minimist-1.2.8"
      sources."mkdirp-2.1.6"
      sources."mkdirp-classic-0.5.3"
      sources."module-deps-6.2.3"
      sources."moment-2.29.4"
      sources."ms-2.0.0"
      sources."negotiator-0.6.3"
      sources."node-cache-5.1.2"
      sources."node-gyp-build-4.6.0"
      sources."node-watch-0.7.4"
      sources."nopt-1.0.10"
      sources."normalize-url-8.0.0"
      sources."nprogress-0.2.0"
      sources."object-assign-4.1.1"
      sources."object-inspect-1.12.3"
      sources."on-finished-2.4.1"
      sources."on-headers-1.0.2"
      sources."once-1.4.0"
      sources."one-time-1.0.0"
      sources."open-8.4.2"
      sources."os-browserify-0.3.0"
      sources."p-cancelable-3.0.0"
      sources."p-limit-4.0.0"
      sources."package-json-8.1.1"
      sources."pako-1.0.11"
      sources."parents-1.0.1"
      sources."parse-asn1-5.1.6"
      sources."parse-json-2.2.0"
      sources."parseurl-1.3.3"
      sources."passport-0.6.0"
      sources."passport-local-1.0.0"
      sources."passport-strategy-1.0.0"
      sources."path-browserify-1.0.1"
      sources."path-is-absolute-1.0.1"
      sources."path-parse-1.0.7"
      sources."path-platform-0.11.15"
      sources."path-to-regexp-0.1.7"
      sources."pause-0.0.1"
      sources."pbkdf2-3.1.2"
      sources."process-0.11.10"
      sources."process-nextick-args-2.0.1"
      sources."proto-list-1.2.4"
      sources."proxy-addr-2.0.7"
      sources."pseudomap-1.0.2"
      (sources."public-encrypt-4.0.3" // {
        dependencies = [
          sources."bn.js-4.12.0"
        ];
      })
      sources."punycode-1.4.1"
      sources."qs-6.11.0"
      sources."querystring-es3-0.2.1"
      sources."quick-lru-5.1.1"
      sources."random-bytes-1.0.0"
      sources."randombytes-2.1.0"
      sources."randomfill-1.0.4"
      sources."range-parser-1.2.1"
      sources."raven-js-3.27.2"
      sources."raw-body-2.5.2"
      sources."rc-1.2.8"
      sources."read-only-stream-2.0.0"
      (sources."readable-stream-2.3.8" // {
        dependencies = [
          sources."safe-buffer-5.1.2"
        ];
      })
      sources."registry-auth-token-5.0.2"
      sources."registry-url-6.0.1"
      sources."require-directory-2.1.1"
      sources."resolve-1.22.4"
      sources."resolve-alpn-1.2.1"
      sources."responselike-3.0.0"
      sources."rimraf-4.1.4"
      sources."ripemd160-2.0.2"
      sources."safe-buffer-5.2.1"
      sources."safe-stable-stringify-2.4.3"
      sources."safer-buffer-2.1.2"
      (sources."semver-7.3.8" // {
        dependencies = [
          sources."lru-cache-6.0.0"
          sources."yallist-4.0.0"
        ];
      })
      (sources."send-0.18.0" // {
        dependencies = [
          sources."ms-2.1.3"
        ];
      })
      sources."serve-static-1.15.0"
      sources."setprototypeof-1.2.0"
      sources."sha.js-2.4.11"
      sources."shasum-object-1.0.0"
      sources."shell-quote-1.8.1"
      sources."side-channel-1.0.4"
      sources."signals-1.0.0"
      sources."simple-concat-1.0.1"
      (sources."simple-swizzle-0.2.2" // {
        dependencies = [
          sources."is-arrayish-0.3.2"
        ];
      })
      sources."snapsvg-0.5.1"
      (sources."socket.io-4.5.4" // {
        dependencies = [
          sources."debug-4.3.4"
          sources."ms-2.1.2"
        ];
      })
      sources."socket.io-adapter-2.4.0"
      (sources."socket.io-parser-4.2.4" // {
        dependencies = [
          sources."debug-4.3.4"
          sources."ms-2.1.2"
        ];
      })
      sources."source-map-0.5.7"
      sources."stack-trace-0.0.10"
      sources."statuses-2.0.1"
      (sources."stream-browserify-3.0.0" // {
        dependencies = [
          sources."readable-stream-3.6.2"
        ];
      })
      sources."stream-combiner2-1.1.1"
      (sources."stream-http-3.2.0" // {
        dependencies = [
          sources."readable-stream-3.6.2"
        ];
      })
      sources."stream-splicer-2.0.1"
      sources."string-width-4.2.3"
      (sources."string_decoder-1.1.1" // {
        dependencies = [
          sources."safe-buffer-5.1.2"
        ];
      })
      sources."strip-ansi-6.0.1"
      sources."strip-bom-2.0.0"
      sources."strip-json-comments-2.0.1"
      sources."subarg-1.0.0"
      sources."supports-preserve-symlinks-flag-1.0.0"
      sources."syntax-error-1.4.0"
      (sources."temp-0.9.4" // {
        dependencies = [
          sources."mkdirp-0.5.6"
          sources."rimraf-2.6.3"
        ];
      })
      sources."text-hex-1.0.0"
      sources."through-2.3.8"
      sources."through2-2.0.5"
      sources."timers-browserify-1.4.2"
      sources."toidentifier-1.0.1"
      sources."triple-beam-1.4.1"
      sources."tsconfig-5.0.3"
      (sources."tsify-5.0.4" // {
        dependencies = [
          sources."semver-6.3.1"
        ];
      })
      sources."tty-browserify-0.0.1"
      sources."type-is-1.6.18"
      sources."typedarray-0.0.6"
      sources."typescript-4.9.5"
      sources."uid-safe-2.1.5"
      sources."umd-3.0.3"
      sources."undeclared-identifiers-1.1.3"
      sources."unpipe-1.0.0"
      sources."url-0.11.1"
      sources."utf-8-validate-5.0.10"
      sources."util-0.12.5"
      sources."util-deprecate-1.0.2"
      sources."utils-merge-1.0.1"
      sources."vary-1.1.2"
      sources."vm-browserify-1.1.2"
      sources."which-typed-array-1.1.11"
      (sources."winston-3.8.2" // {
        dependencies = [
          sources."readable-stream-3.6.2"
        ];
      })
      (sources."winston-transport-4.5.0" // {
        dependencies = [
          sources."readable-stream-3.6.2"
        ];
      })
      sources."wrap-ansi-7.0.0"
      sources."wrappy-1.0.2"
      sources."ws-8.2.3"
      sources."xtend-4.0.2"
      sources."y18n-5.0.8"
      sources."yallist-2.1.2"
      sources."yargs-17.6.2"
      sources."yargs-parser-21.1.1"
      sources."yocto-queue-1.0.0"
    ];
    buildInputs = globalBuildInputs;
    meta = {
      description = "Git made easy";
      homepage = "https://github.com/FredrikNoren/ungit#readme";
      license = "MIT";
    };
    production = true;
    bypassCache = true;
    reconstructLock = true;
  };
  unified-language-server = nodeEnv.buildNodePackage {
    name = "unified-language-server";
    packageName = "unified-language-server";
+2 −0
Original line number Diff line number Diff line
@@ -2458,6 +2458,8 @@ with pkgs;
  transcrypt = callPackage ../applications/version-management/transcrypt { };
  ungit = callPackage ../applications/version-management/ungit { };
  inherit (haskellPackages) git-annex;
  inherit (haskellPackages) git-brunch;