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

Merge pull request #43444 from Infinisil/idris-cleanup

Browse Source 
idris: Recurse into attrs, fix build and remove unneeded overrides
This commit is contained in:
Peter Simons 2018-07-16 20:38:53 +02:00 committed by GitHub
commit 9a32dafd05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 25 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 ];
}); });

2
pkgs/development/idris-modules/build-idris-package.nix
View File

@ -20,7 +20,7 @@ let
}; };
in in
stdenv.mkDerivation ({ stdenv.mkDerivation ({
name = "${name}-${version}"; name = "idris-${name}-${version}";
buildInputs = [ idris-with-packages gmp ] ++ extraBuildInputs; buildInputs = [ idris-with-packages gmp ] ++ extraBuildInputs;
propagatedBuildInputs = allIdrisDeps; propagatedBuildInputs = allIdrisDeps;

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

@ -6645,20 +6645,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 ] ;

1
pkgs/top-level/release.nix
View File

@ -166,6 +166,7 @@ let
} // (mapTestOn ((packagePlatforms pkgs) // rec { } // (mapTestOn ((packagePlatforms pkgs) // rec {
haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskell.compiler = packagePlatforms pkgs.haskell.compiler;
haskellPackages = packagePlatforms pkgs.haskellPackages; haskellPackages = packagePlatforms pkgs.haskellPackages;
idrisPackages = packagePlatforms pkgs.idrisPackages;
# Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66 # Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66