diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-12 18:01:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-12 18:01:46 +0000 |
| commit | 6b78f024b2edf7110b60f66060cb74579b362afb (patch) | |
| tree | 5fa2674e2363466d9fcc056710082a4a00a1ab29 /pkgs/tools/text | |
| parent | a2569dbec0e771c361f23d413b1ace61c3a7cc67 (diff) | |
| parent | 14feac318eefa31d936d9b6a2aacb1928899abfe (diff) | |
| download | nixlib-6b78f024b2edf7110b60f66060cb74579b362afb.tar nixlib-6b78f024b2edf7110b60f66060cb74579b362afb.tar.gz nixlib-6b78f024b2edf7110b60f66060cb74579b362afb.tar.bz2 nixlib-6b78f024b2edf7110b60f66060cb74579b362afb.tar.lz nixlib-6b78f024b2edf7110b60f66060cb74579b362afb.tar.xz nixlib-6b78f024b2edf7110b60f66060cb74579b362afb.tar.zst nixlib-6b78f024b2edf7110b60f66060cb74579b362afb.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/djot-js/default.nix | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/pkgs/tools/text/djot-js/default.nix b/pkgs/tools/text/djot-js/default.nix index bd8b742cc184..656d7d0f6ba8 100644 --- a/pkgs/tools/text/djot-js/default.nix +++ b/pkgs/tools/text/djot-js/default.nix @@ -1,32 +1,21 @@ { lib , buildNpmPackage , fetchFromGitHub -, fetchpatch , installShellFiles }: buildNpmPackage rec { pname = "djot-js"; - version = "0.2.3"; + version = "0.3.1"; src = fetchFromGitHub { owner = "jgm"; repo = "djot.js"; rev = "@djot/djot@${version}"; - hash = "sha256-W/ZQXJXvFEIgj5PeI+jvw4nIkNP4qa1NyQCOv0unIuA="; + hash = "sha256-dQfjI+8cKqn4qLT9eUKfCP++BFCWQ/MmrlQNVRNCFuU="; }; - npmDepsHash = "sha256-x/Oc39S6XwZ/ZsS/lmMU9OkHLlKuUxETYmD8pdHAIg8="; - - patches = [ - # djot.js v0.2.3 doesn't include package-lock.json in the repository - # remove at next release - (fetchpatch { - name = "add-package-lock-json-and-yarn-lock-to-repository.patch"; - url = "https://github.com/jgm/djot.js/commit/15ed52755b2968932d4a9a80805b9ea6183fe539.patch"; - hash = "sha256-saNmU7z4IOOG3ptXMFDSNci5uu0d2GiVZ/FAlaNccTc="; - }) - ]; + npmDepsHash = "sha256-FjrjwhVv2WRjbEga9w37lwz7KYgTTHGsoqt496Uq/0c="; nativeBuildInputs = [ installShellFiles |