public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-09-19 16:59:42 +02:00
parent 105abdd52c 6ff8b675e0
commit 0b12d44c06
44 changed files with 2345 additions and 1008 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-nix.nix
+1 -1
View File
@@ -589,7 +589,7 @@ self: super: builtins.intersectAttrs super {
snap-server = dontCheck super.snap-server;
# Tests require internet
dhall_1_25_0 = dontCheck super.dhall_1_25_0;
dhall_1_26_0 = dontCheck super.dhall_1_26_0;
http-download = dontCheck super.http-download;
pantry = dontCheck super.pantry;