diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-19 09:19:50 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-19 09:19:50 +0100 |
| commit | f79e10061f4e7a8988831e9734e131492e5b311f (patch) | |
| tree | 8ae45d9a41e802f5339f46cd0d05b5f7cb31ffad /pkgs/development/web | |
| parent | bf2877b9ab69caa83daf4191b13d903bc82ab337 (diff) | |
| parent | 7315dc071c901b83dfcacb5536f32699b2cb610a (diff) | |
| download | nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar.gz nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar.bz2 nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar.lz nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar.xz nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar.zst nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/web')
| -rw-r--r-- | pkgs/development/web/nodejs/v10.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/v12.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 22887a44aff..a3b975e3718 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "10.17.0"; - sha256 = "13n5cvb340ba7vwm8il7bjrmpz89h6cibhk9rc3kq9ymdgbnf9j1"; + version = "10.18.0"; + sha256 = "1ppycqffsy7ix6whdp6id7ld1qizwvjlzxyk12kxw4wphjmn49hb"; } diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index fbec83c387a..61c433bc0d4 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -5,8 +5,8 @@ let in buildNodejs { inherit enableNpm; - version = "12.13.1"; - sha256 = "14mia71sr8p0ibz9g4j5xb5qwmik36qi5nhabjbv0sy2kirkm7il"; + version = "12.14.0"; + sha256 = "0wdyz6fymkf2pfb5bf5ddcza7f2n55p9zqjvq661nr5gl9xj32h8"; patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ]; } |