diff --git a/pkgs/by-name/ak/akkoma-fe/package.nix b/pkgs/by-name/ak/akkoma-fe/package.nix index 88096a68f044..ce282974eac4 100644 --- a/pkgs/by-name/ak/akkoma-fe/package.nix +++ b/pkgs/by-name/ak/akkoma-fe/package.nix @@ -9,7 +9,7 @@ nodejs, jpegoptim, oxipng, - nodePackages, + svgo, nix-update-script, }: @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { nodejs jpegoptim oxipng - nodePackages.svgo + svgo ]; postPatch = '' @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { # (Losslessly) optimise compression of image artifacts find dist -type f -name '*.jpg' -execdir ${jpegoptim}/bin/jpegoptim -w$NIX_BUILD_CORES {} \; find dist -type f -name '*.png' -execdir ${oxipng}/bin/oxipng -o max -t $NIX_BUILD_CORES {} \; - find dist -type f -name '*.svg' -execdir ${nodePackages.svgo}/bin/svgo {} \; + find dist -type f -name '*.svg' -execdir ${svgo}/bin/svgo {} \; cp -R -v dist $out diff --git a/pkgs/by-name/sv/svgo/missing-hashes.json b/pkgs/by-name/sv/svgo/missing-hashes.json new file mode 100644 index 000000000000..964e11a01bf8 --- /dev/null +++ b/pkgs/by-name/sv/svgo/missing-hashes.json @@ -0,0 +1,22 @@ +{ + "@rollup/rollup-android-arm-eabi@npm:4.40.1": "bd6599045fbfa1bba4eb4fa6269bf11121ac377a5e9bc5f32265b66cc190d3bf0eece89a4b0503cf38c0f91fc3d64f5daeeccd55420cf522cde478c6c8dacf4c", + "@rollup/rollup-android-arm64@npm:4.40.1": "89932296d6f2dd08ce2d4ee91d5cc14b5305c13f5b7ddba30dad59b525682539191b7769e5b2baf849b664d664daf26b0f29fb2950c2456ff85c5bb11ca39bed", + "@rollup/rollup-darwin-arm64@npm:4.40.1": "0eae1bc7d76ad339ccbfb1571fae06d9c3ad60cf95a513c42f14fb7cbc74697d35ce5f81f5b9a619cb7ff17ae8d78d9f39e78ab9ed2d94bf3755fd4c4b593929", + "@rollup/rollup-darwin-x64@npm:4.40.1": "524543130b510ef8f9775d55ddc6dd3735a1cbd82ffb95b74d677c9cc179848027cffdc6b7318976fa516497c73bc3039da8bbdfabd268156ca0ca1cc41428a8", + "@rollup/rollup-freebsd-arm64@npm:4.40.1": "1e43d5075bdcf1480a04dd7121036fdb1d6432848359cf6d9669d324d4556a2e354a758e276d7a6c2761b9fbefdab1307c58d459968ea847db7be20fe51b1c22", + "@rollup/rollup-freebsd-x64@npm:4.40.1": "f1c1921630d49602836ae77b7c1f0790e71b1317cb68733a21ce9ed6529c222265ae93e4c33eba590695015b3f43c0c54cd0aaa138531ffe3051880673ac2f5d", + "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.1": "bea6ef52650bd0c795429d635a2c8429eecbe5f8365e927cdbca02c1d07d1e28af760669e2d4b7c5ae5ff575c803fae6c370d74b342ea5d4625276dd4651accc", + "@rollup/rollup-linux-arm-musleabihf@npm:4.40.1": "cf41bd211e700928864808382c183e3f41fbc6f4804a9be0292b738f31b8b48ec9721e8717703960875aa0dc15075d7a191e6feb9b6af444ee4c0acd482da50f", + "@rollup/rollup-linux-arm64-gnu@npm:4.40.1": "992f2dbd1f01bfe12c6ff72c5aebc2f7624bae973f8f992aa33422e12b516a718c18076202bfd4dc678ffa82f7ef9e3583582aacca9f4f7fde3e7164e76420ce", + "@rollup/rollup-linux-arm64-musl@npm:4.40.1": "96a17721328bf35fbedecb2a94a881e407179b364921178d1c64a481831ff9ca5b260f627056461c7854946e9c2c854aef537e25ecbce3f1b70b810371f45267", + "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.1": "e313a016a50431cdd0fc2f3855cd345a921304793ab205ff3860523dcd009edd6efd7afc6197220faa5a4e0b638fd29f732f79c91759a392d221d708eceb3af6", + "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.1": "ebc53027c9f6b9b3c36a008fa73958b21f52ece080cda6d2329f6412f255f73ccfed52083b9efff14950511a2a6a2dcb4351347db19f19920f33bbb6d1446be8", + "@rollup/rollup-linux-riscv64-gnu@npm:4.40.1": "9d4e28526eedbf681bc1897da4e61b08657b9a396841e057995c7a54999aeb21548308e30430bfd9c3b9da09deeac7800b1da88bfbebea3c1f2442424107f13c", + "@rollup/rollup-linux-riscv64-musl@npm:4.40.1": "c5f4b1d84f9a468bca4582192da1c8a0242bbb1b96965b3becb96a8a0a19d6522f741e52d591bbf3d9aba6c16a247fef02ed7a4a37a11bbd035f50a5bfd3c5af", + "@rollup/rollup-linux-s390x-gnu@npm:4.40.1": "15ddb6faa9d49a12f87f97a21e16c171b49167b1dfe86d3a81a059e38901fc8edc9d49a68fc88e809699bd77b9eb72edde8bbb49bfb58a40438aa9dd4ceba1ea", + "@rollup/rollup-linux-x64-gnu@npm:4.40.1": "3c240b9aafb8c5360656326cd112568f3003082450dc48fc1eb4a01da460930abbf6235a85cee153f182eeeadcb28ab65116b93e2725e8d935ae60bf098024e2", + "@rollup/rollup-linux-x64-musl@npm:4.40.1": "27ec9c576a7f111333dc764c1ce48c0718e9617467e86fff431fa01c904b890f606f238a73fcfbc5928c78e1e7855947be78e16e49bf6044cfc0abdeffb6da9e", + "@rollup/rollup-win32-arm64-msvc@npm:4.40.1": "c4a4f46690669b6d2eea20440edc46deb103cdf7f41debcfda1c0f68c41bea66526eb6f8befdc0da6192ae762c740e82f76e30164f1bbb4c36faba6c457fb905", + "@rollup/rollup-win32-ia32-msvc@npm:4.40.1": "976361a3888decf0bc81521d83010e58213c264967ce23e023990ef2110a9189785fbb72c3752466179feb069f457d7242adbcb9813c9ce8f7b6363fb3ea6063", + "@rollup/rollup-win32-x64-msvc@npm:4.40.1": "70f30abca4447f1a9c163f07482b0f62029d545f94abe686cf40c6cb1039bd13ee00471927a4cb595c94929b97a8b189c86d7fc9872858d48b1711096ee6d45a" +} diff --git a/pkgs/by-name/sv/svgo/package.nix b/pkgs/by-name/sv/svgo/package.nix new file mode 100644 index 000000000000..2cd74ca00403 --- /dev/null +++ b/pkgs/by-name/sv/svgo/package.nix @@ -0,0 +1,56 @@ +{ + fetchFromGitHub, + lib, + makeWrapper, + nodejs, + stdenv, + yarn-berry_3, +}: + +let + yarn-berry = yarn-berry_3; +in +stdenv.mkDerivation (finalAttrs: { + pname = "svgo"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "svg"; + repo = "svgo"; + tag = "v${finalAttrs.version}"; + hash = "sha256-eSttRNHxcZquIxrTogk+7YS7rhp083qnOwJI71cmO20="; + }; + + missingHashes = ./missing-hashes.json; + + offlineCache = yarn-berry.fetchYarnBerryDeps { + inherit (finalAttrs) src missingHashes; + hash = "sha256-DrIbnm0TWviCfylCI/12XYsx7YOIk7JFVV18Q4dImwU="; + }; + + nativeBuildInputs = [ + makeWrapper + yarn-berry.yarnBerryConfigHook + ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" "$out/lib/svgo" + cp -r bin lib node_modules package.json plugins "$out/lib/svgo" + makeWrapper '${lib.getExe nodejs}' "$out/bin/svgo" \ + --add-flags "$out/lib/svgo/bin/svgo.js" + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/svg/svgo/releases/tag/${finalAttrs.src.tag}"; + description = "Node.js tool for optimizing SVG files"; + homepage = "https://github.com/svg/svgo"; + license = lib.licenses.mit; + mainProgram = "svgo"; + maintainers = [ ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 80024647fc3f..c8e24794e2c1 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -203,6 +203,7 @@ mapAliases { inherit (pkgs) stylelint; # added 2023-09-13 surge = pkgs.surge-cli; # Added 2023-09-08 inherit (pkgs) svelte-language-server; # Added 2024-05-12 + inherit (pkgs) svgo; # added 2025-08-24 swagger = throw "swagger was removed because it was broken and abandoned upstream"; # added 2023-09-09 inherit (pkgs) tailwindcss; # added 2024-12-04 teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index a2ad4054fe62..9167fa3d6624 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -144,7 +144,6 @@ , "smartdc" , "speed-test" , "svelte-check" -, "svgo" , "tern" , "tiddlywiki" , "tsun" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 6e7242c1f9c0..8e8fa9375329 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -62664,56 +62664,6 @@ in bypassCache = true; reconstructLock = true; }; - svgo = nodeEnv.buildNodePackage { - name = "svgo"; - packageName = "svgo"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-3.3.2.tgz"; - sha512 = "OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw=="; - }; - dependencies = [ - sources."@trysound/sax-0.2.0" - sources."boolbase-1.0.0" - sources."commander-7.2.0" - sources."css-select-5.1.0" - ( - sources."css-tree-2.3.1" - // { - dependencies = [ - sources."mdn-data-2.0.30" - ]; - } - ) - sources."css-what-6.1.0" - ( - sources."csso-5.0.5" - // { - dependencies = [ - sources."css-tree-2.2.1" - ]; - } - ) - sources."dom-serializer-2.0.0" - sources."domelementtype-2.3.0" - sources."domhandler-5.0.3" - sources."domutils-3.2.2" - sources."entities-4.5.0" - sources."mdn-data-2.0.28" - sources."nth-check-2.1.1" - sources."picocolors-1.1.1" - sources."source-map-js-1.2.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Nodejs-based tool for optimizing SVG vector graphics files"; - homepage = "https://svgo.dev"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; tern = nodeEnv.buildNodePackage { name = "tern"; packageName = "tern"; diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 306fc5d776a0..bb8a4cb3770e 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -35,7 +35,7 @@ rsync, icu, pnpm_9, - nodePackages, + svgo, nodejs, jq, moreutils, @@ -82,7 +82,7 @@ let libjpeg jpegoptim gifsicle - nodePackages.svgo + svgo jhead ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 687fd2b22662..241b09cc64d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11001,9 +11001,7 @@ with pkgs; moeli = eduli; - emojione = callPackage ../data/fonts/emojione { - inherit (nodePackages) svgo; - }; + emojione = callPackage ../data/fonts/emojione { }; flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { inherit (plasma5Packages) breeze-icons; @@ -15061,7 +15059,7 @@ with pkgs; hjson = with python3Packages; toPythonApplication hjson; - image_optim = callPackage ../applications/graphics/image_optim { inherit (nodePackages) svgo; }; + image_optim = callPackage ../applications/graphics/image_optim { }; libjack2 = jack2.override { prefix = "lib"; };