diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
commit | c504e5d19d940926b3ddcf62c983d66f49f3cbb2 (patch) | |
tree | ec955e58bcac2cb93b9f8c10786b23f61d40cd7e /nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix | |
parent | 72789cefce7b17419815f600fbd18238d89afcc9 (diff) | |
parent | 1737f98af6667560e3e4f930312f9b5002649d04 (diff) | |
download | nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.gz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.bz2 nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.lz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.xz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.zst nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.zip |
Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'
Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
Diffstat (limited to 'nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix')
-rw-r--r-- | nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix b/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix index 40f8b1b43278..b7fd374cb6ea 100644 --- a/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix @@ -15,34 +15,42 @@ let # we need a different version than the one already available in nixpkgs esbuild-hedgedoc = buildGoModule rec { pname = "esbuild"; - version = "0.11.20"; + version = "0.12.27"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "009f2mfgzkzgxjh3034mzdkcvm5vz17sgy1cs604f0425i22z8qm"; + sha256 = "sha256-UclUTfm6fxoYEEdEEmO/j+WLZLe8SFzt7+Tej4bR0RU="; }; - vendorSha256 = "1n5538yik72x94vzfq31qaqrkpxds5xys1wlibw2gn2am0z5c06q"; + vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; }; in mkYarnPackage rec { pname = "hedgedoc"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "hedgedoc"; repo = "hedgedoc"; rev = version; - sha256 = "1h2wyhap264iqm2jh0i05w0hb2j86jsq1plyl7k3an90w7wngyg1"; + sha256 = "sha256-hSKQGkI1+68Zf05RhgRKZo47buyobzjhURSZ30/h0PA="; }; nativeBuildInputs = [ which makeWrapper ]; extraBuildInputs = [ python2 esbuild-hedgedoc ]; yarnNix = ./yarn.nix; + + # FIXME(@Ma27) on the bump to 1.9.0 I had to patch this file manually: + # I replaced `midi "https://github.com/paulrosen/MIDI.js.git#abcjs"` with + # `midi "git+https://github.com/paulrosen/MIDI.js.git#abcjs"` on all occurrences. + # + # Without this change `yarn` attempted to download the code directly from GitHub, with + # the `git+`-prefix it actually uses the `midi.js` version from the offline cache + # created by `yarn2nix`. On future bumps this may be necessary as well! yarnLock = ./yarn.lock; packageJSON = ./package.json; |