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

idris: Remove unneeded overrides

Browse Source 
- The gmp issue has long been fixed and closed
- The preBuild thing was never used afaik, it works no problem without
it, especially since checks don't run (To get checks to work we'd have
to compile the libraries into idris, which are currently nicely
separated)
- The dependencies overrides aren't needed anymore
This commit is contained in:
Silvan Mosberger 2018-07-12 03:37:33 +02:00
parent c78b0efdc0
commit d767c0c253
No known key found for this signature in database
GPG Key ID: 9424360B4B85C9E7
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -421,16 +421,6 @@ self: super: builtins.intersectAttrs super {
# so disable this on Darwin only # so disable this on Darwin only
${if pkgs.stdenv.isDarwin then null else "GLUT"} = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut; ${if pkgs.stdenv.isDarwin then null else "GLUT"} = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut;
idris = overrideCabal super.idris (drv: {
# https://github.com/idris-lang/Idris-dev/issues/2499
librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
# tests and build run executable, so need to set LD_LIBRARY_PATH
preBuild = ''
export LD_LIBRARY_PATH="$PWD/dist/build:$LD_LIBRARY_PATH"
'';
});
libsystemd-journal = overrideCabal super.libsystemd-journal (old: { libsystemd-journal = overrideCabal super.libsystemd-journal (old: {
librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ]; librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ];
}); });

15
pkgs/top-level/all-packages.nix
View File

@ -6633,20 +6633,7 @@ with pkgs;
icedtea_web = icedtea8_web; icedtea_web = icedtea8_web;
idrisPackages = callPackage ../development/idris-modules { idrisPackages = callPackage ../development/idris-modules {
idris-no-deps = haskellPackages.idris;
idris-no-deps =
let
inherit (self.haskell) lib;
haskellPackages = self.haskellPackages.override {
overrides = self: super: {
binary = lib.dontCheck self.binary_0_8_5_1;
parsers = lib.dontCheck super.parsers;
semigroupoids = lib.dontCheck super.semigroupoids;
trifecta = lib.dontCheck super.trifecta;
};
};
in
haskellPackages.idris;
}; };
idris = idrisPackages.with-packages [ idrisPackages.base ] ; idris = idrisPackages.with-packages [ idrisPackages.base ] ;