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

ghc-wrapper: rename 'ghcVersion' attribute to 'version' for consistency

Browse Source
This commit is contained in:
Peter Simons 2013-10-20 15:40:22 +02:00
parent 911ca85240
commit fae8fd8ef1
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/ghc/wrapper.nix
View File

@ -82,6 +82,5 @@ stdenv.mkDerivation {
''; '';
inherit ghc GHCGetPackages GHCPackages; inherit ghc GHCGetPackages GHCPackages;
inherit (ghc) meta; inherit (ghc) meta version;
ghcVersion = ghc.version;
} }

2
pkgs/development/compilers/uhc/default.nix
View File

@ -4,7 +4,7 @@
# this check won't be needed anymore after ghc-wrapper is fixed # this check won't be needed anymore after ghc-wrapper is fixed
# to show ghc-builtin packages in "ghc-pkg list" output. # to show ghc-builtin packages in "ghc-pkg list" output.
let binaryIsBuiltIn = builtins.compareVersions "7.2.1" ghc.ghcVersion != 1; let binaryIsBuiltIn = builtins.compareVersions "7.2.1" ghc.version != 1;
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "uhc-svn-git20120502"; name = "uhc-svn-git20120502";

2
pkgs/development/libraries/haskell/ghc-mod/default.nix
View File

@ -30,7 +30,7 @@ cabal.mkDerivation (self: {
#!/bin/sh #!/bin/sh
COMMAND=\$1 COMMAND=\$1
shift shift
eval exec $out/ghc-mod \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.ghcVersion} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@" eval exec $out/ghc-mod \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
EOF EOF
chmod +x $out/bin/ghc-mod chmod +x $out/bin/ghc-mod
''; '';

2
pkgs/development/tools/documentation/haddock/2.7.2.nix
View File

@ -10,7 +10,7 @@ cabal.mkDerivation (self : {
doCheck = false; doCheck = false;
postInstall = '' postInstall = ''
wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.ghcVersion} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")"
''; '';
meta = { meta = {

2
pkgs/development/tools/documentation/haddock/2.9.2.nix
View File

@ -10,7 +10,7 @@ cabal.mkDerivation (self : {
doCheck = false; doCheck = false;
postInstall = '' postInstall = ''
wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.ghcVersion} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")"
''; '';
meta = { meta = {