From 46bb7c84ac97985607bd55f2c22fd6250642084e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 23 Aug 2024 20:29:53 -0700 Subject: [PATCH] nodePackages.bower2nix: drop --- doc/languages-frameworks/bower.section.md | 2 +- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 134 ------------------ pkgs/development/node-packages/overrides.nix | 9 -- pkgs/top-level/all-packages.nix | 4 +- 6 files changed, 3 insertions(+), 148 deletions(-) diff --git a/doc/languages-frameworks/bower.section.md b/doc/languages-frameworks/bower.section.md index 20c142dad5b9..346852c49426 100644 --- a/doc/languages-frameworks/bower.section.md +++ b/doc/languages-frameworks/bower.section.md @@ -4,7 +4,7 @@ The end result of running Bower is a `bower_components` directory which can be included in the web app's build process. -Bower can be run interactively, by installing `nodePackages.bower`. More interestingly, the Bower components can be declared in a Nix derivation, with the help of `nodePackages.bower2nix`. +Bower can be run interactively, by installing `nodePackages.bower`. More interestingly, the Bower components can be declared in a Nix derivation, with the help of `bower2nix`. ## bower2nix usage {#ssec-bower2nix-usage} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index e1c3fcb5eec3..792156d5bde0 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -63,6 +63,7 @@ mapAliases { inherit (pkgs) bash-language-server; # added 2024-06-07 bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30 bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25 + inherit (pkgs) bower2nix; # added 2024-08-23 inherit (pkgs) btc-rpc-explorer; # added 2023-08-17 inherit (pkgs) carbon-now-cli; # added 2023-08-17 inherit (pkgs) carto; # added 2023-08-17 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index bb694d4507a3..3364d6f72f39 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -21,7 +21,6 @@ , "aws-cdk" , "awesome-lint" , "bower" -, "bower2nix" , "browserify" , "browser-sync" , "cdk8s-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 6e8950921563..8bf89bc8b213 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -59113,140 +59113,6 @@ in bypassCache = true; reconstructLock = true; }; - bower2nix = nodeEnv.buildNodePackage { - name = "bower2nix"; - packageName = "bower2nix"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.2.0.tgz"; - sha512 = "oNHyIWiU5OpUoDCSSRCZQ6JkXyBgtyi+odbv+XSmO6/KCn3B4SRT3/d+QKNj5UQ8KRsrBAI0Ry7CG2OtqrFE1A=="; - }; - dependencies = [ - sources."argparse-1.0.4" - sources."array-find-index-1.0.2" - sources."balanced-match-1.0.2" - sources."bower-1.8.14" - sources."bower-endpoint-parser-0.2.1" - sources."bower-json-0.6.0" - sources."bower-logger-0.2.1" - sources."brace-expansion-1.1.11" - sources."camelcase-2.1.1" - sources."camelcase-keys-2.1.0" - sources."concat-map-0.0.1" - sources."currently-unhandled-0.4.1" - sources."debug-2.6.9" - sources."decamelize-1.2.0" - sources."deep-extend-0.4.2" - sources."ends-with-0.2.0" - sources."error-ex-1.3.2" - sources."ext-list-2.2.2" - sources."ext-name-3.0.0" - sources."find-up-1.1.2" - (sources."fs-extra-0.26.7" // { - dependencies = [ - sources."graceful-fs-4.2.11" - ]; - }) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.2" - sources."get-stdin-4.0.1" - sources."glob-6.0.4" - sources."graceful-fs-3.0.12" - sources."hasown-2.0.2" - sources."hosted-git-info-2.8.9" - sources."indent-string-2.1.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."intersect-1.0.1" - sources."is-arrayish-0.2.1" - sources."is-core-module-2.15.1" - sources."is-finite-1.1.0" - sources."is-plain-obj-1.1.0" - sources."is-utf8-0.2.1" - (sources."jsonfile-2.4.0" // { - dependencies = [ - sources."graceful-fs-4.2.11" - ]; - }) - (sources."klaw-1.3.1" // { - dependencies = [ - sources."graceful-fs-4.2.11" - ]; - }) - (sources."load-json-file-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.2.11" - ]; - }) - sources."lodash-4.2.1" - sources."loud-rejection-1.6.0" - sources."map-obj-1.0.1" - sources."meow-3.7.0" - sources."mime-db-1.53.0" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."ms-2.0.0" - sources."natives-1.1.6" - sources."normalize-package-data-2.5.0" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."os-tmpdir-1.0.2" - sources."parse-json-2.2.0" - sources."path-exists-2.1.0" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - (sources."path-type-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.2.11" - ]; - }) - sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."promised-temp-0.1.0" - sources."q-1.5.1" - sources."read-pkg-1.1.0" - sources."read-pkg-up-1.0.1" - sources."redent-1.0.0" - sources."repeating-2.0.1" - sources."resolve-1.22.8" - (sources."rimraf-2.7.1" // { - dependencies = [ - sources."glob-7.2.3" - ]; - }) - sources."semver-5.7.2" - sources."signal-exit-3.0.7" - sources."sort-keys-1.1.2" - sources."sort-keys-length-1.0.1" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.5.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.20" - sources."sprintf-js-1.0.3" - sources."strip-bom-2.0.0" - sources."strip-indent-1.0.1" - sources."supports-preserve-symlinks-flag-1.0.0" - (sources."temp-0.8.3" // { - dependencies = [ - sources."rimraf-2.2.8" - ]; - }) - sources."trim-newlines-1.0.0" - sources."validate-npm-package-license-3.0.4" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Generate nix expressions to fetch bower dependencies"; - homepage = "https://github.com/rvl/bower2nix"; - license = "GPL-3.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 5424ad35afa6..c3db83758006 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -36,15 +36,6 @@ final: prev: { buildInputs = [ final.node-gyp-build ]; }; - bower2nix = prev.bower2nix.override { - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - postInstall = '' - for prog in bower2nix fetch-bower; do - wrapProgram "$out/bin/$prog" --prefix PATH : ${lib.makeBinPath [ pkgs.git pkgs.nix ]} - done - ''; - }; - expo-cli = prev."expo-cli".override (oldAttrs: { # The traveling-fastlane-darwin optional dependency aborts build on Linux. dependencies = builtins.filter (d: d.packageName != "@expo/traveling-fastlane-${if stdenv.hostPlatform.isLinux then "darwin" else "linux"}") oldAttrs.dependencies; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1463ac224a84..64114c4d6969 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -906,9 +906,7 @@ with pkgs; fet-sh = callPackage ../tools/misc/fet-sh { }; - fetchbower = callPackage ../build-support/fetchbower { - inherit (nodePackages) bower2nix; - }; + fetchbower = callPackage ../build-support/fetchbower { }; fetchbzr = callPackage ../build-support/fetchbzr { };