diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-19 08:27:36 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-19 08:27:36 +0000 |
commit | 3c99915d06ed24034385f2c3510c587236e2f0fb (patch) | |
tree | d54a03aabaac9d1c047484393f6da6a5821cc0ad /pkgs/build-support | |
parent | c3add8c83a11ad19076229a0cb0d4f791fed53a9 (diff) | |
parent | 0f332692123b80c607eecc778e97845646a8d0ae (diff) | |
download | nixpkgs-3c99915d06ed24034385f2c3510c587236e2f0fb.tar nixpkgs-3c99915d06ed24034385f2c3510c587236e2f0fb.tar.gz nixpkgs-3c99915d06ed24034385f2c3510c587236e2f0fb.tar.bz2 nixpkgs-3c99915d06ed24034385f2c3510c587236e2f0fb.tar.lz nixpkgs-3c99915d06ed24034385f2c3510c587236e2f0fb.tar.xz nixpkgs-3c99915d06ed24034385f2c3510c587236e2f0fb.tar.zst nixpkgs-3c99915d06ed24034385f2c3510c587236e2f0fb.zip |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/build-support')
0 files changed, 0 insertions, 0 deletions