summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorRobert Schütz <nix@dotlambda.de>2023-09-03 20:07:04 +0000
committerGitHub <noreply@github.com>2023-09-03 20:07:04 +0000
commitbb411d1967f634678d636bc82fe42bdb5c6dbb19 (patch)
treec5ed8fc300292b6fd3e778f76c665bec7a77d994 /pkgs
parenta98655817cd69f0b8ac24fff767028df696b463f (diff)
parentdf688627b5fa0e245828fbb391bc3d9e66b28ece (diff)
downloadnixpkgs-bb411d1967f634678d636bc82fe42bdb5c6dbb19.tar
nixpkgs-bb411d1967f634678d636bc82fe42bdb5c6dbb19.tar.gz
nixpkgs-bb411d1967f634678d636bc82fe42bdb5c6dbb19.tar.bz2
nixpkgs-bb411d1967f634678d636bc82fe42bdb5c6dbb19.tar.lz
nixpkgs-bb411d1967f634678d636bc82fe42bdb5c6dbb19.tar.xz
nixpkgs-bb411d1967f634678d636bc82fe42bdb5c6dbb19.tar.zst
nixpkgs-bb411d1967f634678d636bc82fe42bdb5c6dbb19.zip
Merge pull request #250250 from dotlambda/musescore-downloader-buildNpmPackage
nodePackages.musescore-downloader: use buildNpmPackage
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/node-packages/aliases.nix1
-rw-r--r--pkgs/development/node-packages/node-packages.json1
-rw-r--r--pkgs/development/node-packages/node-packages.nix84
-rw-r--r--pkgs/tools/audio/dl-librescore/default.nix44
-rw-r--r--pkgs/top-level/all-packages.nix2
5 files changed, 47 insertions, 85 deletions
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index ebb3ec54044..f9fa9edc3d4 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -86,6 +86,7 @@ mapAliases {
   markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29
   inherit (pkgs) markdownlint-cli2; # added 2023-08-22
   mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21
+  musescore-downloader = pkgs.dl-librescore; # added 2023-08-19
   node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21
   inherit (pkgs) npm-check-updates; # added 2023-08-22
   inherit (pkgs) react-static; # added 2023-08-21
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index fc701d7e99a..86ecebcd4b8 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -185,7 +185,6 @@
 , "meat"
 , "mocha"
 , "multi-file-swagger"
-, "musescore-downloader"
 , "near-cli"
 , "neovim"
 , "nijs"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 3d7a23a6f97..c817b12b121 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -98828,90 +98828,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  musescore-downloader = nodeEnv.buildNodePackage {
-    name = "musescore-downloader";
-    packageName = "musescore-downloader";
-    version = "0.26.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/musescore-downloader/-/musescore-downloader-0.26.0.tgz";
-      sha512 = "AHA5wSaEJLwfEEQDl8kLfin7l4uejXYTzWtn/BgUiyWKw4AbuUK2/xfDmULW2KxUfsK2RoLl0bFtIvdvvm4CNA==";
-    };
-    dependencies = [
-      sources."@librescore/fonts-0.4.1"
-      sources."@librescore/sf3-0.3.0"
-      sources."ansi-escapes-4.3.2"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."base64-js-1.5.1"
-      sources."bl-4.1.0"
-      sources."buffer-5.7.1"
-      sources."chalk-4.1.2"
-      sources."chardet-0.7.0"
-      sources."cli-cursor-3.1.0"
-      sources."cli-spinners-2.9.0"
-      sources."cli-width-3.0.0"
-      sources."clone-1.0.4"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."defaults-1.0.4"
-      sources."detect-node-2.1.0"
-      sources."emoji-regex-8.0.0"
-      (sources."encoding-0.1.13" // {
-        dependencies = [
-          sources."iconv-lite-0.6.3"
-        ];
-      })
-      sources."escape-string-regexp-1.0.5"
-      sources."external-editor-3.1.0"
-      sources."figures-3.2.0"
-      sources."has-flag-4.0.0"
-      sources."iconv-lite-0.4.24"
-      sources."ieee754-1.2.1"
-      sources."inherits-2.0.4"
-      sources."inquirer-7.3.3"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-interactive-1.0.0"
-      sources."is-unicode-supported-0.1.0"
-      sources."lodash-4.17.21"
-      sources."log-symbols-4.1.0"
-      sources."mimic-fn-2.1.0"
-      sources."mute-stream-0.0.8"
-      sources."node-fetch-2.6.13"
-      sources."onetime-5.1.2"
-      sources."ora-5.4.1"
-      sources."os-tmpdir-1.0.2"
-      sources."readable-stream-3.6.2"
-      sources."restore-cursor-3.1.0"
-      sources."run-async-2.4.1"
-      sources."rxjs-6.6.7"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."signal-exit-3.0.7"
-      sources."string-width-4.2.3"
-      sources."string_decoder-1.3.0"
-      sources."strip-ansi-6.0.1"
-      sources."supports-color-7.2.0"
-      sources."through-2.3.8"
-      sources."tmp-0.0.33"
-      sources."tr46-0.0.3"
-      sources."tslib-1.14.1"
-      sources."type-fest-0.21.3"
-      sources."util-deprecate-1.0.2"
-      sources."wcwidth-1.0.1"
-      sources."webidl-conversions-3.0.1"
-      sources."webmscore-0.18.0"
-      sources."whatwg-url-5.0.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "download sheet music from musescore.com for free, no login or Musescore Pro required | 免登录、免 Musescore Pro,免费下载 musescore.com 上的曲谱";
-      homepage = "https://github.com/Xmader/musescore-downloader#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   near-cli = nodeEnv.buildNodePackage {
     name = "near-cli";
     packageName = "near-cli";
diff --git a/pkgs/tools/audio/dl-librescore/default.nix b/pkgs/tools/audio/dl-librescore/default.nix
new file mode 100644
index 00000000000..5e8306f2122
--- /dev/null
+++ b/pkgs/tools/audio/dl-librescore/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, stdenv
+, buildNpmPackage
+, fetchFromGitHub
+, python3
+, darwin
+}:
+
+buildNpmPackage rec {
+  pname = "dl-librescore";
+  version = "0.34.47";
+
+  src = fetchFromGitHub {
+    owner = "LibreScore";
+    repo = "dl-librescore";
+    rev = "v${version}";
+    hash = "sha256-yXreyQiIKmZEw2HcpnCW4TxCTHzdq+KuPSlFPFZy2oU=";
+  };
+
+  npmDepsHash = "sha256-qKu7xViApKg/4EubS4tsZEtNoW62rpC4e6xmBugSkek=";
+
+  # see https://github.com/LibreScore/dl-librescore/pull/32
+  # TODO can be removed with next update
+  postPatch = ''
+    substituteInPlace package-lock.json \
+      --replace 50c7a1508cd9358757c30794e14ba777e6faa8aa b4cb32eb1734a2f73ba2d92743647b1a91c0e2a8
+  '';
+
+  makeCacheWritable = true;
+
+  nativeBuildInputs = [
+    python3
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.cctools
+  ];
+
+  meta = {
+    description = "Download sheet music";
+    homepage = "https://github.com/LibreScore/dl-librescore";
+    license = lib.licenses.mit;
+    mainProgram = "dl-librescore";
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 507a6538062..03c2bae7a75 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3711,6 +3711,8 @@ with pkgs;
 
   dkimpy = with python3Packages; toPythonApplication dkimpy;
 
+  dl-librescore = callPackage ../tools/audio/dl-librescore { };
+
   dontgo403 = callPackage ../tools/security/dontgo403 { };
 
   dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { };