0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00

Merge branch 'master' into staging-next

Brings in Haskell rebuild.
Hydra nixpkgs: ?compare=1525186
This commit is contained in:
Vladimír Čunát 2019-06-14 17:47:23 +02:00
commit 788261a1a9
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
95 changed files with 4596 additions and 2756 deletions

View file

@ -92,6 +92,7 @@
./programs/bcc.nix
./programs/blcr.nix
./programs/browserpass.nix
./programs/captive-browser.nix
./programs/ccache.nix
./programs/cdemu.nix
./programs/chromium.nix