1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 11:32:03 +00:00
nixpkgs/pkgs
Vladimír Čunát 6168c2e45f
Merge master into staging
This is to cleanup the (re-)revert of merge to master.
2018-02-26 22:55:11 +01:00
..
applications Merge master into staging 2018-02-26 22:55:11 +01:00
build-support Revert "Revert "Merge staging at '8d490ca9934d0' into master"" 2018-02-26 22:54:48 +01:00
common-updater
data Revert "Revert "Merge staging at '8d490ca9934d0' into master"" 2018-02-26 22:54:48 +01:00
desktops tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
development Merge master into staging 2018-02-26 22:55:11 +01:00
games instead: 3.0.1 -> 3.2.0 2018-02-26 16:04:30 +01:00
misc Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-26 10:50:18 +01:00
os-specific Merge master into staging 2018-02-26 22:55:11 +01:00
servers Merge master into staging 2018-02-26 22:55:11 +01:00
shells antigen: 2.2.2 -> 2.2.3 2018-02-24 15:05:54 -08:00
stdenv libgcrypt: Fix cross-compilation 2018-02-24 22:51:22 -05:00
test tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
tools Merge master into staging 2018-02-26 22:55:11 +01:00
top-level Merge master into staging 2018-02-26 22:55:11 +01:00