From 83d0a3a37c68b380bfd23d2fd6fde090571d9423 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 23 Mar 2013 13:05:43 +0100 Subject: [PATCH] ghc: add meta.license attribute to all compiler versions --- pkgs/development/compilers/ghc/6.10.1-binary.nix | 1 + pkgs/development/compilers/ghc/6.10.1.nix | 2 +- pkgs/development/compilers/ghc/6.10.2-binary.nix | 1 + pkgs/development/compilers/ghc/6.10.2.nix | 2 +- pkgs/development/compilers/ghc/6.10.3.nix | 2 +- pkgs/development/compilers/ghc/6.10.4.nix | 2 +- pkgs/development/compilers/ghc/6.11.nix | 2 +- pkgs/development/compilers/ghc/6.12.1-binary.nix | 1 + pkgs/development/compilers/ghc/6.12.1.nix | 2 +- pkgs/development/compilers/ghc/6.12.2.nix | 2 +- pkgs/development/compilers/ghc/6.12.3.nix | 2 +- pkgs/development/compilers/ghc/6.4.2-binary.nix | 1 + pkgs/development/compilers/ghc/6.4.2.nix | 2 +- pkgs/development/compilers/ghc/6.6.1.nix | 2 +- pkgs/development/compilers/ghc/6.8.2.nix | 2 +- pkgs/development/compilers/ghc/6.8.3.nix | 2 +- pkgs/development/compilers/ghc/7.0.1.nix | 2 +- pkgs/development/compilers/ghc/7.0.2.nix | 2 +- pkgs/development/compilers/ghc/7.0.3.nix | 2 +- pkgs/development/compilers/ghc/7.0.4-binary.nix | 1 + pkgs/development/compilers/ghc/7.2.1.nix | 2 +- pkgs/development/compilers/ghc/7.2.2.nix | 2 +- pkgs/development/compilers/ghc/7.4.2-binary.nix | 1 + pkgs/development/compilers/ghc/7.4.2.nix | 2 +- pkgs/development/compilers/ghc/7.6.1.nix | 2 +- pkgs/development/compilers/ghc/7.6.2.nix | 2 +- pkgs/development/compilers/ghc/head.nix | 2 +- 27 files changed, 27 insertions(+), 21 deletions(-) diff --git a/pkgs/development/compilers/ghc/6.10.1-binary.nix b/pkgs/development/compilers/ghc/6.10.1-binary.nix index 353a4176ea46..dd79ef9c8e75 100644 --- a/pkgs/development/compilers/ghc/6.10.1-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.1-binary.nix @@ -98,5 +98,6 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; + meta.license = stdenv.lib.licenses.bsd3; meta.platforms = ["i686-darwin" "x86_64-linux" "i686-linux"]; } diff --git a/pkgs/development/compilers/ghc/6.10.1.nix b/pkgs/development/compilers/ghc/6.10.1.nix index b53ce9aced37..ccb9f434230a 100644 --- a/pkgs/development/compilers/ghc/6.10.1.nix +++ b/pkgs/development/compilers/ghc/6.10.1.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { inherit homepage; description = "The Glasgow Haskell Compiler"; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 02f1db354a1e..7effff83c69a 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -97,5 +97,6 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; + meta.license = stdenv.lib.licenses.bsd3; meta.platforms = ["x86_64-linux" "i686-linux"]; } diff --git a/pkgs/development/compilers/ghc/6.10.2.nix b/pkgs/development/compilers/ghc/6.10.2.nix index 2df43a4c7d75..4988734f5809 100644 --- a/pkgs/development/compilers/ghc/6.10.2.nix +++ b/pkgs/development/compilers/ghc/6.10.2.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { inherit homepage; description = "The Glasgow Haskell Compiler"; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; passthru = { diff --git a/pkgs/development/compilers/ghc/6.10.3.nix b/pkgs/development/compilers/ghc/6.10.3.nix index 2ecf35eedfe9..f6683278e454 100644 --- a/pkgs/development/compilers/ghc/6.10.3.nix +++ b/pkgs/development/compilers/ghc/6.10.3.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { inherit homepage; description = "The Glasgow Haskell Compiler"; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix index 53fd1c522168..92afc0f4b88b 100644 --- a/pkgs/development/compilers/ghc/6.10.4.nix +++ b/pkgs/development/compilers/ghc/6.10.4.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { inherit homepage; description = "The Glasgow Haskell Compiler"; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; passthru = { diff --git a/pkgs/development/compilers/ghc/6.11.nix b/pkgs/development/compilers/ghc/6.11.nix index 778b819aa703..914403cdd660 100644 --- a/pkgs/development/compilers/ghc/6.11.nix +++ b/pkgs/development/compilers/ghc/6.11.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { meta = { inherit homepage; description = "The Glasgow Haskell Compiler"; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; } diff --git a/pkgs/development/compilers/ghc/6.12.1-binary.nix b/pkgs/development/compilers/ghc/6.12.1-binary.nix index 23486b5f4fa5..6f3411da4af6 100644 --- a/pkgs/development/compilers/ghc/6.12.1-binary.nix +++ b/pkgs/development/compilers/ghc/6.12.1-binary.nix @@ -99,5 +99,6 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; + meta.license = stdenv.lib.licenses.bsd3; meta.platforms = ["x86_64-linux" "i686-linux"]; } diff --git a/pkgs/development/compilers/ghc/6.12.1.nix b/pkgs/development/compilers/ghc/6.12.1.nix index 78a000de309e..31c763c4505c 100644 --- a/pkgs/development/compilers/ghc/6.12.1.nix +++ b/pkgs/development/compilers/ghc/6.12.1.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres ]; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; # TODO: requires a comment as to what it does and why it is needed. diff --git a/pkgs/development/compilers/ghc/6.12.2.nix b/pkgs/development/compilers/ghc/6.12.2.nix index 1a48d6cf3183..5db5fc49fc66 100644 --- a/pkgs/development/compilers/ghc/6.12.2.nix +++ b/pkgs/development/compilers/ghc/6.12.2.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres ]; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; # TODO: requires a comment as to what it does and why it is needed. diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index bc2d8967cd4b..05ceba030b9f 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres ]; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; # TODO: requires a comment as to what it does and why it is needed. diff --git a/pkgs/development/compilers/ghc/6.4.2-binary.nix b/pkgs/development/compilers/ghc/6.4.2-binary.nix index 1a5bf059e9f5..8e4e6c58a3f9 100644 --- a/pkgs/development/compilers/ghc/6.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.4.2-binary.nix @@ -62,5 +62,6 @@ stdenv.mkDerivation { '' else ""; + meta.license = stdenv.lib.licenses.bsd3; meta.platforms = ["i686-darwin" "x86_64-linux" "i686-linux"]; } diff --git a/pkgs/development/compilers/ghc/6.4.2.nix b/pkgs/development/compilers/ghc/6.4.2.nix index c526e5d6cb45..e336d4e83b1b 100644 --- a/pkgs/development/compilers/ghc/6.4.2.nix +++ b/pkgs/development/compilers/ghc/6.4.2.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { meta = { description = "The Glasgow Haskell Compiler"; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; } diff --git a/pkgs/development/compilers/ghc/6.6.1.nix b/pkgs/development/compilers/ghc/6.6.1.nix index 994ebc286c30..0f91b9d5052c 100644 --- a/pkgs/development/compilers/ghc/6.6.1.nix +++ b/pkgs/development/compilers/ghc/6.6.1.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (rec { meta = { description = "The Glasgow Haskell Compiler"; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; postInstall = '' diff --git a/pkgs/development/compilers/ghc/6.8.2.nix b/pkgs/development/compilers/ghc/6.8.2.nix index 2681f325c929..8af158625906 100644 --- a/pkgs/development/compilers/ghc/6.8.2.nix +++ b/pkgs/development/compilers/ghc/6.8.2.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (rec { meta = { description = "The Glasgow Haskell Compiler"; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; configureFlags=[ diff --git a/pkgs/development/compilers/ghc/6.8.3.nix b/pkgs/development/compilers/ghc/6.8.3.nix index b6900321552c..281ff61b700c 100644 --- a/pkgs/development/compilers/ghc/6.8.3.nix +++ b/pkgs/development/compilers/ghc/6.8.3.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "The Glasgow Haskell Compiler"; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; configureFlags=[ diff --git a/pkgs/development/compilers/ghc/7.0.1.nix b/pkgs/development/compilers/ghc/7.0.1.nix index db696d2b218c..da7e81f5730c 100644 --- a/pkgs/development/compilers/ghc/7.0.1.nix +++ b/pkgs/development/compilers/ghc/7.0.1.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres ]; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; # TODO: requires a comment as to what it does and why it is needed. diff --git a/pkgs/development/compilers/ghc/7.0.2.nix b/pkgs/development/compilers/ghc/7.0.2.nix index 426c8725d0ba..6706b99e2034 100644 --- a/pkgs/development/compilers/ghc/7.0.2.nix +++ b/pkgs/development/compilers/ghc/7.0.2.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres ]; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; } diff --git a/pkgs/development/compilers/ghc/7.0.3.nix b/pkgs/development/compilers/ghc/7.0.3.nix index ad80dd9e79d9..0b422043ae28 100644 --- a/pkgs/development/compilers/ghc/7.0.3.nix +++ b/pkgs/development/compilers/ghc/7.0.3.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres ]; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; } diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 0bfc81a17a4e..455d552b91ac 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -87,5 +87,6 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; + meta.license = stdenv.lib.licenses.bsd3; meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; } diff --git a/pkgs/development/compilers/ghc/7.2.1.nix b/pkgs/development/compilers/ghc/7.2.1.nix index 3938d608d331..867df5aae6bf 100644 --- a/pkgs/development/compilers/ghc/7.2.1.nix +++ b/pkgs/development/compilers/ghc/7.2.1.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.andres stdenv.lib.maintainers.simons ]; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; } diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix index 0450537ad900..c6ec0cb75c4d 100644 --- a/pkgs/development/compilers/ghc/7.2.2.nix +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.andres stdenv.lib.maintainers.simons ]; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; } diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index e0a8fee4b660..59eb957a45f4 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -87,5 +87,6 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; + meta.license = stdenv.lib.licenses.bsd3; meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; } diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index ea44e49cca3d..51f3f7f9df4b 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.andres stdenv.lib.maintainers.simons ]; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; } diff --git a/pkgs/development/compilers/ghc/7.6.1.nix b/pkgs/development/compilers/ghc/7.6.1.nix index 335befb6c125..99c93c7a980a 100644 --- a/pkgs/development/compilers/ghc/7.6.1.nix +++ b/pkgs/development/compilers/ghc/7.6.1.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.andres stdenv.lib.maintainers.simons ]; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; } diff --git a/pkgs/development/compilers/ghc/7.6.2.nix b/pkgs/development/compilers/ghc/7.6.2.nix index fd678d090a27..ac2810c62b26 100644 --- a/pkgs/development/compilers/ghc/7.6.2.nix +++ b/pkgs/development/compilers/ghc/7.6.2.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.andres stdenv.lib.maintainers.simons ]; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; } diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 157b25779b3d..8258ac274190 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.andres stdenv.lib.maintainers.simons ]; - platforms = ghc.meta.platforms; + inherit (ghc.meta) license platforms; }; }