Merge remote-tracking branch 'origin/master' into haskell-updates

This commit is contained in:
sternenseemann
2021-05-08 14:04:31 +02:00
698 changed files with 3107 additions and 2091 deletions
+1 -1
View File
@@ -107461,7 +107461,7 @@ self: {
platforms = [
"aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
];
}) {inherit (pkgs.gnome3) gnome-keyring;
}) {inherit (pkgs.gnome) gnome-keyring;
inherit (pkgs) libgnome-keyring;};
"gnomevfs" = callPackage