Merge pull request #252265 from Lord-Valen/npm-rtlcss

pkgs/applications/finance/odoo/default.nix

@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , fetchzip
 , python310
-, nodePackages
+, rtlcss
 , wkhtmltopdf
 , nixosTests
 }:
@@ -63,7 +63,7 @@ in python.pkgs.buildPythonApplication rec {
   doCheck = false;
 
   makeWrapperArgs = [
-    "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf nodePackages.rtlcss ]}"
+    "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf rtlcss ]}"
   ];
 
   propagatedBuildInputs = with python.pkgs; [

pkgs/applications/finance/odoo/odoo15.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchzip, python310, nodePackages, wkhtmltopdf
+{ stdenv, lib, fetchFromGitHub, fetchzip, python310, rtlcss, wkhtmltopdf
 , nixosTests }:
 
 let
@@ -59,7 +59,7 @@ in python.pkgs.buildPythonApplication rec {
     "--prefix"
     "PATH"
     ":"
-    "${lib.makeBinPath [ wkhtmltopdf nodePackages.rtlcss ]}"
+    "${lib.makeBinPath [ wkhtmltopdf rtlcss ]}"
   ];
 
   propagatedBuildInputs = with python.pkgs; [

pkgs/development/libraries/rtlcss/default.nix

@@ -0,0 +1,24 @@
+{ buildNpmPackage, fetchFromGitHub, lib, ... }:
+
+buildNpmPackage rec {
+  pname = "rtlcss";
+  version = "4.1.0";
+
+  src = fetchFromGitHub {
+    owner = "MohammadYounes";
+    repo = "rtlcss";
+    rev = "v${version}";
+    hash = "sha256-KdAf7jzt8o/YEzT/bLCXj546HX0oC90kr44u3p3qv/k=";
+  };
+
+  npmDepsHash = "sha256-ghVgvw55w7T9WxokYtlFSgCfGvcOxFzm2wQIFi+6uBY=";
+
+  dontNpmBuild = true;
+
+  meta = with lib; {
+    description = "Framework for converting Left-To-Right (LTR) Cascading Style Sheets(CSS) to Right-To-Left (RTL)";
+    homepage = "https://rtlcss.com";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
+  };
+}

pkgs/development/node-packages/aliases.nix

@@ -85,6 +85,7 @@ mapAliases {
   inherit (pkgs) npm-check-updates; # added 2023-08-22
   readability-cli = pkgs.readability-cli; # Added 2023-06-12
   reveal-md = pkgs.reveal-md; # added 2023-07-31
+  inherit (pkgs) rtlcss; # added 2023-08-29
   s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18
   ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21
   stf = throw "stf was removed because it was broken"; # added 2023-08-21

pkgs/development/node-packages/node-packages.json

@@ -242,7 +242,6 @@
 , "rimraf"
 , "rollup"
 , {"rust-analyzer-build-deps": "../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps"}
-, "rtlcss"
 , "sass"
 , "semver"
 , "serve"

pkgs/development/node-packages/node-packages.nix

@@ -109255,32 +109255,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  rtlcss = nodeEnv.buildNodePackage {
-    name = "rtlcss";
-    packageName = "rtlcss";
-    version = "4.1.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/rtlcss/-/rtlcss-4.1.0.tgz";
-      sha512 = "W+N4hh0nVqVrrn3mRkHakxpB+c9cQ4CRT67O39kgA+1DjyhrdsqyCqIuHXyvWaXn4/835n+oX3fYJCi4+G/06A==";
-    };
-    dependencies = [
-      sources."escalade-3.1.1"
-      sources."nanoid-3.3.6"
-      sources."picocolors-1.0.0"
-      sources."postcss-8.4.28"
-      sources."source-map-js-1.0.2"
-      sources."strip-json-comments-3.1.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Framework for transforming cascading style sheets (CSS) from left-to-right (LTR) to right-to-left (RTL)";
-      homepage = "https://rtlcss.com/";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   sass = nodeEnv.buildNodePackage {
     name = "sass";
     packageName = "sass";

pkgs/top-level/all-packages.nix

@@ -24964,6 +24964,8 @@ with pkgs;
 
   rshell = python3.pkgs.callPackage ../development/embedded/rshell { };
 
+  rtlcss = callPackage ../development/libraries/rtlcss { };
+
   rttr = callPackage ../development/libraries/rttr { };
 
   rubberband = callPackage ../development/libraries/rubberband { };