1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 14:11:36 +00:00
nixpkgs/pkgs
Vladimír Čunát 5effa4e0f9
Merge branch 'master' into staging-next
Comments on conflicts:
- llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is
  to build all targets, so we should be fine
- some pypi hashes: they were equivalent, just base16 vs. base32
2019-02-01 09:22:29 +01:00
..
applications Merge branch 'master' into staging-next 2019-02-01 09:22:29 +01:00
build-support Merge branch 'master' into staging-next 2019-02-01 09:22:29 +01:00
common-updater
data Merge branch 'master' into staging-next 2019-02-01 09:22:29 +01:00
desktops gnome3.evolution: 3.30.3 -> 3.30.4 2019-01-28 19:28:26 +00:00
development Merge branch 'master' into staging-next 2019-02-01 09:22:29 +01:00
games Merge pull request #53872 from Profpatsch/ankidocs 2019-01-30 13:45:12 -05:00
misc vimPlugins: update (#54889) 2019-01-29 20:55:52 +01:00
os-specific Merge branch 'master' into staging-next 2019-02-01 09:22:29 +01:00
servers Merge pull request #54893 from nyanloutre/mautrix-telegram 2019-01-31 10:24:49 +01:00
shells zsh: fix for infinite recursion in VCS_INFO_detect_p4 2019-01-28 20:09:36 +01:00
stdenv Merge branch 'master' into staging-next 2019-02-01 09:22:29 +01:00
test linux: added tests for the config 2019-01-28 09:07:24 +09:00
tools Merge branch 'master' into staging-next 2019-02-01 09:22:29 +01:00
top-level Merge branch 'master' into staging-next 2019-02-01 09:22:29 +01:00