diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-07 13:04:31 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-07 13:04:31 +0100 |
| commit | f19eb635b4585f6ba4f9f4c3e9e07f56623446f5 (patch) | |
| tree | 4d64a15e34e8a2b54466ba165297a6bb08bfb280 /pkgs/development | |
| parent | 0e4e47512d709e93c35fa575dd82e3e6ce4f884d (diff) | |
| parent | 2be707eca80b573c931007de78c936d49ab45395 (diff) | |
Merge branch 'master' into staging-next
https://github.com/NixOS/nixpkgs/commit/b04fc593e7b55fe1f74421b11589f12a339c92e2 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
Diffstat (limited to 'pkgs/development')