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

gmp{4,5}: Split into multiple outputs

Browse Source 
Keep all versions consistent so that e.g. 'gmp.dev' is always available,
regardless of version.
This commit is contained in:
Tuomas Tynkkynen 2016-04-17 15:32:35 +03:00
parent 8ed3d6a7e5
commit fd4b3dcccb
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/gmp/4.3.2.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, m4, cxx ? true }: { stdenv, fetchurl, m4, cxx ? true }:
stdenv.mkDerivation rec { let self = stdenv.mkDerivation rec {
name = "gmp-4.3.2"; name = "gmp-4.3.2";
src = fetchurl { src = fetchurl {
@ -8,6 +8,12 @@ stdenv.mkDerivation rec {
sha256 = "0x8prpqi9amfcmi7r4zrza609ai9529pjaq0h4aw51i867064qck"; sha256 = "0x8prpqi9amfcmi7r4zrza609ai9529pjaq0h4aw51i867064qck";
}; };
#outputs TODO: split $cxx due to libstdc++ dependency
# maybe let ghc use a version with *.so shared with rest of nixpkgs and *.a added
# - see #5855 for related discussion
outputs = [ "out" "dev" "info" ];
passthru.static = self.out;
nativeBuildInputs = [ m4 ]; nativeBuildInputs = [ m4 ];
# Prevent the build system from using sub-architecture-specific # Prevent the build system from using sub-architecture-specific
@ -60,4 +66,5 @@ stdenv.mkDerivation rec {
maintainers = [ ]; maintainers = [ ];
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
} };
in self

11
pkgs/development/libraries/gmp/5.1.x.nix
View File

@ -2,7 +2,7 @@
with { inherit (stdenv.lib) optional optionalString; }; with { inherit (stdenv.lib) optional optionalString; };
stdenv.mkDerivation rec { let self = stdenv.mkDerivation rec {
name = "gmp-5.1.3"; name = "gmp-5.1.3";
src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv
@ -10,7 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "0q5i39pxrasgn9qdxzpfbwhh11ph80p57x6hf48m74261d97j83m"; sha256 = "0q5i39pxrasgn9qdxzpfbwhh11ph80p57x6hf48m74261d97j83m";
}; };
outputs = [ "out" "info" ]; #outputs TODO: split $cxx due to libstdc++ dependency
# maybe let ghc use a version with *.so shared with rest of nixpkgs and *.a added
# - see #5855 for related discussion
outputs = [ "out" "dev" "info" ];
passthru.static = self.out;
nativeBuildInputs = [ m4 ]; nativeBuildInputs = [ m4 ];
@ -76,4 +80,5 @@ stdenv.mkDerivation rec {
platforms = platforms.all; platforms = platforms.all;
maintainers = [ maintainers.peti ]; maintainers = [ maintainers.peti ];
}; };
} };
in self

2
pkgs/development/libraries/gmp/6.x.nix
View File

@ -10,7 +10,7 @@ let self = stdenv.mkDerivation rec {
sha256 = "1mpzprdzkgfpdc1v2lf4dxlxps4x8bvmzvd8n1ri6gw9y9jrh458"; sha256 = "1mpzprdzkgfpdc1v2lf4dxlxps4x8bvmzvd8n1ri6gw9y9jrh458";
}; };
#outputs TODO: split $cxx due to libstdc++ dependency; maybe port to gmp5; #outputs TODO: split $cxx due to libstdc++ dependency
# maybe let ghc use a version with *.so shared with rest of nixpkgs and *.a added # maybe let ghc use a version with *.so shared with rest of nixpkgs and *.a added
# - see #5855 for related discussion # - see #5855 for related discussion
outputs = [ "out" "dev" "info" ]; outputs = [ "out" "dev" "info" ];