mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 22:50:49 +00:00
d8c5d95330
vcunat removed the unrelated glib change. Conflicts: pkgs/development/libraries/glib/default.nix pkgs/os-specific/linux/kernel/generic.nix pkgs/os-specific/linux/kernel/manual-config.nix |
||
---|---|---|
.. | ||
1.6.nix | ||
default.nix | ||
no-build-timestamp.patch |