diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2022-02-01 21:37:39 -0500 |
---|---|---|
committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2022-02-01 21:37:39 -0500 |
commit | 3087088c41d5725cb62b90247eb28b1fa2f70b4f (patch) | |
tree | 40170a864d919c0b0d4ce236eab455fe240618d5 /pkgs/data | |
parent | 184d6ba76bc9db589223ba522027533c6c55f015 (diff) | |
parent | d05ca00ab5cbaa4413b93192bff054feb3695e4e (diff) | |
download | nixpkgs-3087088c41d5725cb62b90247eb28b1fa2f70b4f.tar nixpkgs-3087088c41d5725cb62b90247eb28b1fa2f70b4f.tar.gz nixpkgs-3087088c41d5725cb62b90247eb28b1fa2f70b4f.tar.bz2 nixpkgs-3087088c41d5725cb62b90247eb28b1fa2f70b4f.tar.lz nixpkgs-3087088c41d5725cb62b90247eb28b1fa2f70b4f.tar.xz nixpkgs-3087088c41d5725cb62b90247eb28b1fa2f70b4f.tar.zst nixpkgs-3087088c41d5725cb62b90247eb28b1fa2f70b4f.zip |
Merge branch 'staging-next' into staging
Conflicts: pkgs/top-level/aliases.nix pkgs/top-level/python-aliases.nix
Diffstat (limited to 'pkgs/data')
0 files changed, 0 insertions, 0 deletions