diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-21 17:24:16 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-21 17:24:16 +0000 |
| commit | 83b8726e5f6f85a28405c7772f75093fd9a399a3 (patch) | |
| tree | 5864b8d15f92f596e4750302c13c3b50f0d6aaf4 /nixpkgs/nixos | |
| parent | 538bce249c736adf495d4b9ed87883a570c7962b (diff) | |
| parent | 95e6dfd5d9065feaa527eecb04f2fd49048bbca0 (diff) | |
| download | nixlib-83b8726e5f6f85a28405c7772f75093fd9a399a3.tar nixlib-83b8726e5f6f85a28405c7772f75093fd9a399a3.tar.gz nixlib-83b8726e5f6f85a28405c7772f75093fd9a399a3.tar.bz2 nixlib-83b8726e5f6f85a28405c7772f75093fd9a399a3.tar.lz nixlib-83b8726e5f6f85a28405c7772f75093fd9a399a3.tar.xz nixlib-83b8726e5f6f85a28405c7772f75093fd9a399a3.tar.zst nixlib-83b8726e5f6f85a28405c7772f75093fd9a399a3.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/python-modules/velbus-aio/default.nix
Diffstat (limited to 'nixpkgs/nixos')
0 files changed, 0 insertions, 0 deletions