diff options
| author | Robin Gloster <mail@glob.in> | 2019-07-29 22:57:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-29 22:57:21 +0000 |
| commit | 4107e208a1ccc190463f7b7894b62252fa865727 (patch) | |
| tree | 834114022780ab20b7631653766d1da06046e7d7 /pkgs/top-level | |
| parent | ad55361a0211dc06ab4d3825df066fb8c002cccc (diff) | |
| parent | cee4d964a7ade77298f76c1a38318e0279919a90 (diff) | |
| download | nixlib-4107e208a1ccc190463f7b7894b62252fa865727.tar nixlib-4107e208a1ccc190463f7b7894b62252fa865727.tar.gz nixlib-4107e208a1ccc190463f7b7894b62252fa865727.tar.bz2 nixlib-4107e208a1ccc190463f7b7894b62252fa865727.tar.lz nixlib-4107e208a1ccc190463f7b7894b62252fa865727.tar.xz nixlib-4107e208a1ccc190463f7b7894b62252fa865727.tar.zst nixlib-4107e208a1ccc190463f7b7894b62252fa865727.zip | |
Merge pull request #60429 from WilliButz/codimd-update
codimd: 1.2.0 -> 1.4.0, repackage with yarn2nix
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index db980c05fb07..fe3f18519137 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -378,8 +378,6 @@ mapAliases ({ xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xlibs = xorg; # added 2015-09 xpraGtk3 = xpra; # added 2018-09-13 - yarn2nix = throw "Use upstream https://github.com/moretea/yarn2nix"; # added 2019-04-12 - mkYarnPackage = yarn2nix; # added 2019-04-12 youtubeDL = youtube-dl; # added 2014-10-26 zdfmediathk = mediathekview; # added 2019-01-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 110cc27e8467..4a03f722c971 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2176,7 +2176,13 @@ in cmst = libsForQt5.callPackage ../tools/networking/cmst { }; - codimd = callPackage ../servers/web-apps/codimd { }; + codimd = callPackage ../servers/web-apps/codimd { + nodejs = nodejs-10_x; + yarn2nix = yarn2nix-moretea.override { + nodejs = nodejs-10_x; + yarn = yarn.override { nodejs = nodejs-10_x; }; + }; + }; colord = callPackage ../tools/misc/colord { }; @@ -7011,6 +7017,8 @@ in yarn = callPackage ../development/tools/yarn { }; + yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { }; + yasr = callPackage ../applications/audio/yasr { }; yank = callPackage ../tools/misc/yank { }; |