Alyssa Ross ac5a927919 Merge remote-tracking branch 'nixpkgs/master' into staging-next ... Conflicts: pkgs/development/python-modules/einops/default.nix pkgs/development/python-modules/elegy/default.nix		2022-03-31 11:46:46 +00:00
..
release-info
frog.nix	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2022-03-31 11:46:46 +00:00
frogdata.nix	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2022-03-31 11:46:46 +00:00
libfolia.nix	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2022-03-31 11:46:46 +00:00
mbt-add-libxml2-dep.patch
mbt.nix	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2022-03-31 11:46:46 +00:00
packages.nix
test.nix
ticcutils.nix	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2022-03-31 11:46:46 +00:00
timbl.nix	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2022-03-31 11:46:46 +00:00
timblserver.nix	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2022-03-31 11:46:46 +00:00
ucto.nix	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2022-03-31 11:46:46 +00:00
uctodata.nix	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2022-03-31 11:46:46 +00:00
update