pyrox.dev
lol
ghc-wrapper: rename 'ghcVersion' attribute to 'version' for consistency
+5
-6
+1
-2
pkgs/development/compilers/ghc/wrapper.nix
+1
-2
pkgs/development/compilers/ghc/wrapper.nix
+1
-1
pkgs/development/compilers/uhc/default.nix
+1
-1
pkgs/development/compilers/uhc/default.nix
···
4
4
5
5
# this check won't be needed anymore after ghc-wrapper is fixed
6
6
# to show ghc-builtin packages in "ghc-pkg list" output.
7
-
let binaryIsBuiltIn = builtins.compareVersions "7.2.1" ghc.ghcVersion != 1;
7
+
let binaryIsBuiltIn = builtins.compareVersions "7.2.1" ghc.version != 1;
8
8
9
9
in stdenv.mkDerivation {
10
10
name = "uhc-svn-git20120502";
+1
-1
pkgs/development/libraries/haskell/ghc-mod/default.nix
+1
-1
pkgs/development/libraries/haskell/ghc-mod/default.nix
···
30
30
#!/bin/sh
31
31
COMMAND=\$1
32
32
shift
33
-
eval exec $out/ghc-mod \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.ghcVersion} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
33
+
eval exec $out/ghc-mod \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
34
34
EOF
35
35
chmod +x $out/bin/ghc-mod
36
36
'';
+1
-1
pkgs/development/tools/documentation/haddock/2.7.2.nix
+1
-1
pkgs/development/tools/documentation/haddock/2.7.2.nix
···
10
10
doCheck = false;
11
11
12
12
postInstall = ''
13
-
wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.ghcVersion} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")"
13
+
wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")"
14
14
'';
15
15
16
16
meta = {
+1
-1
pkgs/development/tools/documentation/haddock/2.9.2.nix
+1
-1
pkgs/development/tools/documentation/haddock/2.9.2.nix
···
10
10
doCheck = false;
11
11
12
12
postInstall = ''
13
-
wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.ghcVersion} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")"
13
+
wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")"
14
14
'';
15
15
16
16
meta = {