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

Merge remote-tracking branch 'origin/master' into haskell-updates.

Browse Source
This commit is contained in:
Peter Simons
2021-01-11 10:56:52 +01:00
parent daa50421eb c3c06134e2
commit 3aae69103b
7851 changed files with 34570 additions and 30128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-common.nix
+5
View File
@@ -1510,6 +1510,11 @@ self: super: {
sha256 = "0g2m0y46zr3xs9fswkm4h9adhsg6gzl5zwgidshsjh3k3rq4h7b1";
});
# https://github.com/ekmett/half/issues/35
half = if pkgs.stdenv.isAarch64
then dontCheck super.half
else super.half;
# 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124
heist = doJailbreak super.heist;
pkgs/development/haskell-modules/configuration-ghcjs.nix
+2 -2
View File
@@ -92,7 +92,7 @@ self: super:
base template-haskell ghcjs-base split containers text ghc-prim
];
description = "FFI QuasiQuoter for GHCJS";
license = pkgs.stdenv.lib.licenses.mit;
license = pkgs.lib.licenses.mit;
}) {};
# experimental
ghcjs-vdom = self.callPackage
@@ -112,7 +112,7 @@ self: super:
base ghc-prim ghcjs-ffiqq ghcjs-base ghcjs-prim containers split
template-haskell
];
license = pkgs.stdenv.lib.licenses.mit;
license = pkgs.lib.licenses.mit;
description = "bindings for https://github.com/Matt-Esch/virtual-dom";
}) {};
pkgs/development/haskell-modules/configuration-nix.nix
+2 -2
View File
@@ -711,7 +711,7 @@ self: super: builtins.intersectAttrs super {
# mplayer-spot uses mplayer at runtime.
mplayer-spot =
let path = pkgs.stdenv.lib.makeBinPath [ pkgs.mplayer ];
let path = pkgs.lib.makeBinPath [ pkgs.mplayer ];
in overrideCabal (addBuildTool super.mplayer-spot pkgs.makeWrapper) (oldAttrs: {
postInstall = ''
wrapProgram $out/bin/mplayer-spot --prefix PATH : "${path}"
@@ -723,7 +723,7 @@ self: super: builtins.intersectAttrs super {
primitive_0_7_1_0 = dontCheck super.primitive_0_7_1_0;
cut-the-crap =
let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ];
let path = pkgs.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ];
in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: {
postInstall = ''
wrapProgram $out/bin/cut-the-crap \