Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nodePackages.rtlcss: use buildNpmPackage #252265

Merged
merged 1 commit into from
Aug 30, 2023
Merged

nodePackages.rtlcss: use buildNpmPackage #252265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/applications/finance/odoo/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
, fetchFromGitHub
, fetchzip
, python310
, nodePackages
, rtlcss
, wkhtmltopdf
, nixosTests
}:
Expand Down Expand Up @@ -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; [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/finance/odoo/odoo15.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchzip, python310, nodePackages, wkhtmltopdf
{ stdenv, lib, fetchFromGitHub, fetchzip, python310, rtlcss, wkhtmltopdf
, nixosTests }:

let
Expand Down Expand Up @@ -59,7 +59,7 @@ in python.pkgs.buildPythonApplication rec {
"--prefix"
"PATH"
":"
"${lib.makeBinPath [ wkhtmltopdf nodePackages.rtlcss ]}"
"${lib.makeBinPath [ wkhtmltopdf rtlcss ]}"
];

propagatedBuildInputs = with python.pkgs; [
Expand Down
24 changes: 24 additions & 0 deletions pkgs/development/libraries/rtlcss/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ buildNpmPackage, fetchFromGitHub, lib, ... }:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{ buildNpmPackage, fetchFromGitHub, lib, ... }:
{ 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; [ ];
};
}
1 change: 1 addition & 0 deletions pkgs/development/node-packages/aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,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
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/node-packages/node-packages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@
, "rimraf"
, "rollup"
, {"rust-analyzer-build-deps": "../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps"}
, "rtlcss"
, "sass"
, "semver"
, "serve"
Expand Down
26 changes: 0 additions & 26 deletions pkgs/development/node-packages/node-packages.nix
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24955,6 +24955,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 { };
Expand Down