diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-04-08 17:14:31 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-04-08 17:14:31 +0200 |
| commit | 625ce6c7f66c0b2ccae30f95cdd9e48feed8561c (patch) | |
| tree | c0c5a9d3510dc4dfa3008b9c35dbfea234894e81 /pkgs/os-specific/linux/kernel/generic.nix | |
| parent | 97490e67836cda5e181caf0a49f1e2d7ca31949f (diff) | |
| parent | bf6abedefbebbec8f54cda97bd33bc06c5f46ed5 (diff) | |
| download | nixpkgs-625ce6c7f66c0b2ccae30f95cdd9e48feed8561c.tar nixpkgs-625ce6c7f66c0b2ccae30f95cdd9e48feed8561c.tar.gz nixpkgs-625ce6c7f66c0b2ccae30f95cdd9e48feed8561c.tar.bz2 nixpkgs-625ce6c7f66c0b2ccae30f95cdd9e48feed8561c.tar.lz nixpkgs-625ce6c7f66c0b2ccae30f95cdd9e48feed8561c.tar.xz nixpkgs-625ce6c7f66c0b2ccae30f95cdd9e48feed8561c.tar.zst nixpkgs-625ce6c7f66c0b2ccae30f95cdd9e48feed8561c.zip | |
Merge branch 'staging-next' into staging
In python-packages.nix, resolve conflict between 50d604314e736d24dc7aa6749b5482c859147b17 and 187d0371ab3220ee40da1f616e4c48d85ac28986.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generic.nix')
0 files changed, 0 insertions, 0 deletions