b4a3f93 · tix · git.iko.soy

git.iko.soy/tix

Better numbered greeks

commitb4a3f931fd8dd8a78259cba5cf53b7384b8c385e authoriko <ilyakooo0@gmail.com> dateTue 4 May 2021, 21:28 (5 years ago) parent966ba07

29 files changed+469−468

compare with master

unifiedsplit

src/Tix/Types.hs+5−5

@@ -54,7 +54,6 @@ instance MKM.Keyable Pred where

5454 TBruijn _ -> S.empty

5555 )

5656

57−-- this seems bad. It should not drop constraints.

5857(//) :: NType -> NType -> NType -> Pred

5958(//) = Update

6059{-# INLINE (//) #-}

@@ -285,9 +284,10 @@ getDeBurjins' =

285284 TTypeVariable _ -> const S.empty

286285 )

287286

288−greek :: [Text]

289−greek = ["α", "β", "γ", "δ", "ε", "ζ", "η", "θ", "ι", "κ", "λ", "μ", "ν", "ξ", "ο", "π", "ρ", "σ", "τ", "υ", "φ", "χ", "ψ", "ω"]

290−

291287variableNames :: [Text]

292288variableNames =

293− greek <> fmap (\(n, g) -> g <> T.pack (show n)) (zip [1 :: Int ..] greek)

289+ fmap T.pack $

290+ greek <> foldMap (\n -> (<> show n) <$> greek) ([1 :: Int ..] :: [Int])

291+ where

292+ greek :: [String]

293+ greek = ["α", "β", "γ", "δ", "ε", "ζ", "η", "θ", "ι", "κ", "λ", "μ", "ν", "ξ", "ο", "π", "ρ", "σ", "τ", "υ", "φ", "χ", "ψ", "ω"]

test/golden/importless/1.3.txt+3−3

@@ -1,4 +1,4 @@

1−∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3.

1+∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1.

22( β.arch = String,

33 β.isDarwin = Bool,

44 β.lib = γ,

@@ -62,8 +62,8 @@

6262 blas = η;

6363 cmake = α1;

6464 curl = ι;

65− fetchFromGitHub = β2;

66− fetchurl = γ3;

65+ fetchFromGitHub = β1;

66+ fetchurl = γ1;

6767 fetchzip = {sha256 = String; url = String;} -> κ;

6868 fftw = η;

6969 fftwSinglePrec = η;

test/golden/importless/aliases.txt+187−184

@@ -1,5 +1,8 @@

1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3 δ4 ε5 ζ6 η7 θ8 ι9 κ10

2−λ11 μ12 ν13 ξ14 ο15 π16 ρ17 σ18 τ19 υ20 φ21 χ22 ψ23 ω24.

1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1 κ1

2+λ1 μ1 ν1 ξ1 ο1 π1 ρ1 σ1 τ1 υ1 φ1 χ1 ψ1 ω1 α2 β2 γ2 δ2 ε2 ζ2 η2 θ2 ι2 κ2 λ2 μ2 ν2

3+ξ2 ο2 π2 ρ2 σ2 τ2 υ2 φ2 χ2 ψ2 ω2 α3 β3 γ3 δ3 ε3 ζ3 η3 θ3 ι3 κ3 λ3 μ3 ν3 ξ3 ο3 π3

4+ρ3 σ3 τ3 υ3 φ3 χ3 ψ3 ω3 α4 β4 γ4 δ4 ε4 ζ4 η4 θ4 ι4 κ4 λ4 μ4 ν4 ξ4 ο4 π4 ρ4 σ4

5+τ4.

36( ( { BufOnly = α;

47 CSApprox = β;

58 Colour_Sampler_Pack = γ;

@@ -25,190 +28,190 @@

2528 caw = ψ;

2629 coffee-script = ω;

2730 coffeeScript = α1;

28− colors-solarized = β2;

29− colorsamplerpack = γ3;

30− command_T = δ4;

31− commentary = ε5;

32− committia = ζ6;

33− concealedyank = η7;

34− context-filetype = θ8;

35− css_color_5056 = ι9;

36− csv = κ10;

37− ctrlp = λ11;

38− cute-python = μ12;

39− denite = ν13;

40− easy-align = ξ14;

41− easygit = ο15;

42− easymotion = π16;

43− echodoc = ρ17;

44− eighties = σ18;

45− extradite = τ19;

46− fugitive = υ20;

47− ghc-mod-vim = φ21;

48− ghcmod = χ22;

49− gitgutter = ψ23;

50− goyo = ω24;

51− gundo = 〚3 48〛;

52− haskellConceal = 〚3 49〛;

53− haskellConcealPlus = 〚3 50〛;

54− haskellconceal = 〚3 51〛;

55− hier = 〚3 52〛;

56− hlint-refactor = 〚3 53〛;

57− hoogle = 〚3 54〛;

58− ipython = 〚3 55〛;

59− latex-live-preview = 〚3 56〛;

60− maktaba = 〚3 57〛;

61− multiple-cursors = 〚3 58〛;

62− necoGhc = 〚3 59〛;

63− neocomplete = 〚3 60〛;

64− neoinclude = 〚3 61〛;

65− neomru = 〚3 62〛;

66− neosnippet = 〚3 63〛;

67− open-browser = 〚3 64〛;

68− pathogen = 〚3 65〛;

69− polyglot = 〚3 66〛;

70− prettyprint = 〚3 67〛;

71− quickrun = 〚3 68〛;

72− rainbow_parentheses = 〚3 69〛;

73− repeat = 〚3 70〛;

74− rhubarb = 〚3 71〛;

75− riv = 〚3 72〛;

76− sensible = 〚3 73〛;

77− signature = 〚3 74〛;

78− sleuth = 〚3 75〛;

79− snipmate = 〚3 76〛;

80− solarized = 〚3 77〛;

81− solidity = 〚3 78〛;

82− sourcemap = 〚3 79〛;

83− sourcemap.vim = 〚3 80〛;

84− stylish-haskell = 〚3 81〛;

85− stylishHaskell = 〚3 82〛;

86− surround = 〚3 83〛;

87− table-mode = 〚3 84〛;

88− tabpagebuffer = 〚3 85〛;

89− tabpagecd = 〚3 86〛;

90− taglist = 〚3 87〛;

91− thumbnail = 〚3 88〛;

92− tlib = 〚3 89〛;

93− tmux-navigator = 〚3 90〛;

94− tmuxNavigator = 〚3 91〛;

95− tslime = 〚3 92〛;

96− unite = 〚3 93〛;

97− vim-addon-vim2nix = 〚3 94〛;

98− vimproc = 〚3 95〛;

99− vimshell = 〚3 96〛;

100− vinegar = 〚3 97〛;

101− watchdogs = 〚3 98〛;

102− wombat256 = 〚3 99〛;

103− xterm-color-table = 〚3 100〛;

104− yankring = 〚3 101〛;

105− zeavim = 〚3 102〛;

31+ colors-solarized = β1;

32+ colorsamplerpack = γ1;

33+ command_T = δ1;

34+ commentary = ε1;

35+ committia = ζ1;

36+ concealedyank = η1;

37+ context-filetype = θ1;

38+ css_color_5056 = ι1;

39+ csv = κ1;

40+ ctrlp = λ1;

41+ cute-python = μ1;

42+ denite = ν1;

43+ easy-align = ξ1;

44+ easygit = ο1;

45+ easymotion = π1;

46+ echodoc = ρ1;

47+ eighties = σ1;

48+ extradite = τ1;

49+ fugitive = υ1;

50+ ghc-mod-vim = φ1;

51+ ghcmod = χ1;

52+ gitgutter = ψ1;

53+ goyo = ω1;

54+ gundo = α2;

55+ haskellConceal = β2;

56+ haskellConcealPlus = γ2;

57+ haskellconceal = δ2;

58+ hier = ε2;

59+ hlint-refactor = ζ2;

60+ hoogle = η2;

61+ ipython = θ2;

62+ latex-live-preview = ι2;

63+ maktaba = κ2;

64+ multiple-cursors = λ2;

65+ necoGhc = μ2;

66+ neocomplete = ν2;

67+ neoinclude = ξ2;

68+ neomru = ο2;

69+ neosnippet = π2;

70+ open-browser = ρ2;

71+ pathogen = σ2;

72+ polyglot = τ2;

73+ prettyprint = υ2;

74+ quickrun = φ2;

75+ rainbow_parentheses = χ2;

76+ repeat = ψ2;

77+ rhubarb = ω2;

78+ riv = α3;

79+ sensible = β3;

80+ signature = γ3;

81+ sleuth = δ3;

82+ snipmate = ε3;

83+ solarized = ζ3;

84+ solidity = η3;

85+ sourcemap = θ3;

86+ sourcemap.vim = ι3;

87+ stylish-haskell = κ3;

88+ stylishHaskell = λ3;

89+ surround = μ3;

90+ table-mode = ν3;

91+ tabpagebuffer = ξ3;

92+ tabpagecd = ο3;

93+ taglist = π3;

94+ thumbnail = ρ3;

95+ tlib = σ3;

96+ tmux-navigator = τ3;

97+ tmuxNavigator = υ3;

98+ tslime = φ3;

99+ unite = χ3;

100+ vim-addon-vim2nix = ψ3;

101+ vimproc = ω3;

102+ vimshell = α4;

103+ vinegar = β4;

104+ watchdogs = γ4;

105+ wombat256 = δ4;

106+ xterm-color-table = ε4;

107+ yankring = ζ4;

108+ zeavim = η4;

106109 }

107110 ) //

108− ( 〚1 103〛

111+ ( θ4

109112 ) ~

110− ( 〚1 104〛

113+ ( ι4

111114 ),

112− 〚1 105〛.mapAttrs = (〚4 106〛 -> 〚5 107〛 -> 〚5 107〛) -> 〚4 104〛 -> 〚4 108〛,

113− 〚1 109〛.BufOnly-vim = α,

114− 〚1 109〛.Colour-Sampler-Pack = γ,

115− 〚1 109〛.YankRing-vim = σ,

116− 〚1 109〛.a-vim = υ,

117− 〚1 109〛.bats-vim = φ,

118− 〚1 109〛.builtins = 〚2 110〛,

119− 〚1 109〛.calendar-vim = χ,

120− 〚1 109〛.caw-vim = ψ,

121− 〚1 109〛.command-t = δ4,

122− 〚1 109〛.committia-vim = ζ6,

123− 〚1 109〛.concealedyank-vim = η7,

124− 〚1 109〛.context_filetype-vim = θ8,

125− 〚1 109〛.cosco-vim = δ,

126− 〚1 109〛.csapprox = β,

127− 〚1 109〛.csv-vim = κ10,

128− 〚1 109〛.ctrlp-vim = λ11,

129− 〚1 109〛.denite-nvim = ν13,

130− 〚1 109〛.dontDistribute = 〚3 107〛 -> 〚3 107〛,

131− 〚1 109〛.echodoc-vim = ρ17,

132− 〚1 109〛.ghcmod-vim = φ21,

133− 〚1 109〛.goyo-vim = ω24,

134− 〚1 109〛.gundo-vim = ζ,

135− 〚1 109〛.hlint-refactor-vim = 〚2 53〛,

136− 〚1 109〛.isDerivation = 〚3 107〛 -> Bool,

137− 〚1 109〛.neco-ghc = 〚2 59〛,

138− 〚1 109〛.neocomplete-vim = 〚2 60〛,

139− 〚1 109〛.neoinclude-vim = 〚2 61〛,

140− 〚1 109〛.neomru-vim = 〚2 62〛,

141− 〚1 109〛.neosnippet-vim = 〚2 63〛,

142− 〚1 109〛.nerdcommenter = ξ,

143− 〚1 109〛.nerdtree = ο,

144− 〚1 109〛.open-browser-vim = 〚2 64〛,

145− 〚1 109〛.rainbow_parentheses-vim = 〚2 69〛,

146− 〚1 109〛.removeAttrs = 〚3 107〛 -> [String] -> 〚4 107〛,

147− 〚1 109〛.riv-vim = 〚2 72〛,

148− 〚1 109〛.sourcemap-vim = 〚2 79〛,

149− 〚1 109〛.supertab = ι,

150− 〚1 109〛.syntastic = κ,

151− 〚1 109〛.tabpagebuffer-vim = 〚2 85〛,

152− 〚1 109〛.tabular = μ,

153− 〚1 109〛.tagbar = ν,

154− 〚1 109〛.taglist-vim = 〚2 87〛,

155− 〚1 109〛.throw = String -> 〚3 107〛,

156− 〚1 109〛.thumbnail-vim = 〚2 88〛,

157− 〚1 109〛.tlib_vim = 〚2 89〛,

158− 〚1 109〛.tslime-vim = 〚2 92〛,

159− 〚1 109〛.ultisnips = π,

160− 〚1 109〛.unite-vim = 〚2 93〛,

161− 〚1 109〛.vim-SyntaxRange = λ,

162− 〚1 109〛.vim-airline = τ,

163− 〚1 109〛.vim-coffee-script = ω,

164− 〚1 109〛.vim-colors-solarized = θ,

165− 〚1 109〛.vim-commentary = ε5,

166− 〚1 109〛.vim-css-color = ι9,

167− 〚1 109〛.vim-cute-python = μ12,

168− 〚1 109〛.vim-easy-align = ξ14,

169− 〚1 109〛.vim-easygit = ο15,

170− 〚1 109〛.vim-easymotion = π16,

171− 〚1 109〛.vim-eighties = σ18,

172− 〚1 109〛.vim-extradite = τ19,

173− 〚1 109〛.vim-fugitive = υ20,

174− 〚1 109〛.vim-gist = ε,

175− 〚1 109〛.vim-gitgutter = ψ23,

176− 〚1 109〛.vim-haskellConcealPlus = 〚2 50〛,

177− 〚1 109〛.vim-haskellconceal = 〚2 49〛,

178− 〚1 109〛.vim-hier = 〚2 52〛,

179− 〚1 109〛.vim-hoogle = η,

180− 〚1 109〛.vim-ipython = 〚2 55〛,

181− 〚1 109〛.vim-latex-live-preview = 〚2 56〛,

182− 〚1 109〛.vim-maktaba = 〚2 57〛,

183− 〚1 109〛.vim-multiple-cursors = 〚2 58〛,

184− 〚1 109〛.vim-pathogen = 〚2 65〛,

185− 〚1 109〛.vim-polyglot = 〚2 66〛,

186− 〚1 109〛.vim-prettyprint = 〚2 67〛,

187− 〚1 109〛.vim-quickrun = 〚2 68〛,

188− 〚1 109〛.vim-repeat = 〚2 70〛,

189− 〚1 109〛.vim-rhubarb = 〚2 71〛,

190− 〚1 109〛.vim-sensible = 〚2 73〛,

191− 〚1 109〛.vim-signature = 〚2 74〛,

192− 〚1 109〛.vim-sleuth = 〚2 75〛,

193− 〚1 109〛.vim-snipmate = 〚2 76〛,

194− 〚1 109〛.vim-solidity = 〚2 78〛,

195− 〚1 109〛.vim-stylish-haskell = 〚2 81〛,

196− 〚1 109〛.vim-surround = 〚2 83〛,

197− 〚1 109〛.vim-table-mode = 〚2 84〛,

198− 〚1 109〛.vim-tabpagecd = 〚2 86〛,

199− 〚1 109〛.vim-tmux-navigator = 〚2 90〛,

200− 〚1 109〛.vim-vinegar = 〚2 97〛,

201− 〚1 109〛.vim-watchdogs = 〚2 98〛,

202− 〚1 109〛.vim2nix = 〚2 94〛,

203− 〚1 109〛.vimproc-vim = 〚2 95〛,

204− 〚1 109〛.vimshell-vim = 〚2 96〛,

205− 〚1 109〛.webapi-vim = ρ,

206− 〚1 109〛.wombat256-vim = 〚2 99〛,

207− 〚1 109〛.xterm-color-table-vim = 〚2 100〛,

208− 〚1 109〛.zeavim-vim = 〚2 102〛,

209− 〚1 107〛.recurseForDerivations = Bool,

210− 〚1 110〛.hasAttr = 〚3 106〛 -> 〚4 109〛 -> Bool,

211− 〚1 111〛.fromJSON = 〚3 112〛 -> 〚3 113〛,

212− 〚1 114〛.readFile = Path -> 〚3 112〛

115+ κ4.mapAttrs = (λ4 -> μ4 -> μ4) -> ι4 -> ν4,

116+ ξ4.BufOnly-vim = α,

117+ ξ4.Colour-Sampler-Pack = γ,

118+ ξ4.YankRing-vim = σ,

119+ ξ4.a-vim = υ,

120+ ξ4.bats-vim = φ,

121+ ξ4.builtins = ο4,

122+ ξ4.calendar-vim = χ,

123+ ξ4.caw-vim = ψ,

124+ ξ4.command-t = δ1,

125+ ξ4.committia-vim = ζ1,

126+ ξ4.concealedyank-vim = η1,

127+ ξ4.context_filetype-vim = θ1,

128+ ξ4.cosco-vim = δ,

129+ ξ4.csapprox = β,

130+ ξ4.csv-vim = κ1,

131+ ξ4.ctrlp-vim = λ1,

132+ ξ4.denite-nvim = ν1,

133+ ξ4.dontDistribute = μ4 -> μ4,

134+ ξ4.echodoc-vim = ρ1,

135+ ξ4.ghcmod-vim = φ1,

136+ ξ4.goyo-vim = ω1,

137+ ξ4.gundo-vim = ζ,

138+ ξ4.hlint-refactor-vim = ζ2,

139+ ξ4.isDerivation = μ4 -> Bool,

140+ ξ4.neco-ghc = μ2,

141+ ξ4.neocomplete-vim = ν2,

142+ ξ4.neoinclude-vim = ξ2,

143+ ξ4.neomru-vim = ο2,

144+ ξ4.neosnippet-vim = π2,

145+ ξ4.nerdcommenter = ξ,

146+ ξ4.nerdtree = ο,

147+ ξ4.open-browser-vim = ρ2,

148+ ξ4.rainbow_parentheses-vim = χ2,

149+ ξ4.removeAttrs = μ4 -> [String] -> μ4,

150+ ξ4.riv-vim = α3,

151+ ξ4.sourcemap-vim = θ3,

152+ ξ4.supertab = ι,

153+ ξ4.syntastic = κ,

154+ ξ4.tabpagebuffer-vim = ξ3,

155+ ξ4.tabular = μ,

156+ ξ4.tagbar = ν,

157+ ξ4.taglist-vim = π3,

158+ ξ4.throw = String -> μ4,

159+ ξ4.thumbnail-vim = ρ3,

160+ ξ4.tlib_vim = σ3,

161+ ξ4.tslime-vim = φ3,

162+ ξ4.ultisnips = π,

163+ ξ4.unite-vim = χ3,

164+ ξ4.vim-SyntaxRange = λ,

165+ ξ4.vim-airline = τ,

166+ ξ4.vim-coffee-script = ω,

167+ ξ4.vim-colors-solarized = θ,

168+ ξ4.vim-commentary = ε1,

169+ ξ4.vim-css-color = ι1,

170+ ξ4.vim-cute-python = μ1,

171+ ξ4.vim-easy-align = ξ1,

172+ ξ4.vim-easygit = ο1,

173+ ξ4.vim-easymotion = π1,

174+ ξ4.vim-eighties = σ1,

175+ ξ4.vim-extradite = τ1,

176+ ξ4.vim-fugitive = υ1,

177+ ξ4.vim-gist = ε,

178+ ξ4.vim-gitgutter = ψ1,

179+ ξ4.vim-haskellConcealPlus = γ2,

180+ ξ4.vim-haskellconceal = β2,

181+ ξ4.vim-hier = ε2,

182+ ξ4.vim-hoogle = η,

183+ ξ4.vim-ipython = θ2,

184+ ξ4.vim-latex-live-preview = ι2,

185+ ξ4.vim-maktaba = κ2,

186+ ξ4.vim-multiple-cursors = λ2,

187+ ξ4.vim-pathogen = σ2,

188+ ξ4.vim-polyglot = τ2,

189+ ξ4.vim-prettyprint = υ2,

190+ ξ4.vim-quickrun = φ2,

191+ ξ4.vim-repeat = ψ2,

192+ ξ4.vim-rhubarb = ω2,

193+ ξ4.vim-sensible = β3,

194+ ξ4.vim-signature = γ3,

195+ ξ4.vim-sleuth = δ3,

196+ ξ4.vim-snipmate = ε3,

197+ ξ4.vim-solidity = η3,

198+ ξ4.vim-stylish-haskell = κ3,

199+ ξ4.vim-surround = μ3,

200+ ξ4.vim-table-mode = ν3,

201+ ξ4.vim-tabpagecd = ο3,

202+ ξ4.vim-tmux-navigator = τ3,

203+ ξ4.vim-vinegar = β4,

204+ ξ4.vim-watchdogs = γ4,

205+ ξ4.vim2nix = ψ3,

206+ ξ4.vimproc-vim = ω3,

207+ ξ4.vimshell-vim = α4,

208+ ξ4.webapi-vim = ρ,

209+ ξ4.wombat256-vim = δ4,

210+ ξ4.xterm-color-table-vim = ε4,

211+ ξ4.zeavim-vim = η4,

212+ μ4.recurseForDerivations = Bool,

213+ ο4.hasAttr = λ4 -> ξ4 -> Bool,

214+ π4.fromJSON = ρ4 -> σ4,

215+ τ4.readFile = Path -> ρ4

213216) =>

214−〚2 105〛 -> 〚3 109〛 -> 〚3 108〛

217+κ4 -> ξ4 -> ν4

test/golden/importless/appdaemon.txt+35−35

@@ -1,9 +1,9 @@

1−∀ ω α1 β2 γ3 δ4 ε5 ζ6 η7 θ8 ι9 κ10 λ11.

1+∀ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1 κ1 λ1.

22( ω.dotlambda = α1,

3− ω.licenses = β2,

4− ω.maintainers = γ3,

3+ ω.licenses = β1,

4+ ω.maintainers = γ1,

55 ω.peterhoeg = α1,

6− δ4.override =

6+ δ1.override =

77 { packageOverrides =

88 ∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ.

99 ( α.overridePythonAttrs = (β -> {src = γ; version = String;}) -> δ,

@@ -22,48 +22,48 @@

2222 ) =>

2323 υ -> α -> {aiohttp-jinja2 = δ; bcrypt = φ; jinja2 = χ; yarl = ψ;};

2424 } ->

25− ε5,

26− ε5.buildPythonApplication =

25+ ε1,

26+ ε1.buildPythonApplication =

2727 { doCheck = Bool;

2828 meta =

2929 { description = String;

3030 homepage = String;

31− license = ζ6;

31+ license = ζ1;

3232 maintainers = [α1];

3333 };

3434 pname = String;

3535 postPatch = String;

36− propagatedBuildInputs = [η7];

37− src = θ8;

36+ propagatedBuildInputs = [η1];

37+ src = θ1;

3838 version = String;

3939 } ->

40− ι9,

41− ε5.pkgs = κ10,

42− β2.mit = ζ6,

43− λ11.pkgs = ε5,

44− κ10.aiohttp = η7,

45− κ10.aiohttp-jinja2 = η7,

46− κ10.astral = η7,

47− κ10.bcrypt = η7,

48− κ10.daemonize = η7,

49− κ10.dateutil = η7,

50− κ10.deepdiff = η7,

51− κ10.feedparser = η7,

52− κ10.iso8601 = η7,

53− κ10.jinja2 = η7,

54− κ10.paho-mqtt = η7,

55− κ10.pid = η7,

56− κ10.python-socketio = η7,

57− κ10.pyyaml = η7,

58− κ10.requests = η7,

59− κ10.setuptools = η7,

60− κ10.voluptuous = η7,

61− κ10.websocket_client = η7,

62− κ10.yarl = η7

40+ ι1,

41+ ε1.pkgs = κ1,

42+ β1.mit = ζ1,

43+ λ1.pkgs = ε1,

44+ κ1.aiohttp = η1,

45+ κ1.aiohttp-jinja2 = η1,

46+ κ1.astral = η1,

47+ κ1.bcrypt = η1,

48+ κ1.daemonize = η1,

49+ κ1.dateutil = η1,

50+ κ1.deepdiff = η1,

51+ κ1.feedparser = η1,

52+ κ1.iso8601 = η1,

53+ κ1.jinja2 = η1,

54+ κ1.paho-mqtt = η1,

55+ κ1.pid = η1,

56+ κ1.python-socketio = η1,

57+ κ1.pyyaml = η1,

58+ κ1.requests = η1,

59+ κ1.setuptools = η1,

60+ κ1.voluptuous = η1,

61+ κ1.websocket_client = η1,

62+ κ1.yarl = η1

6363) =>

6464{ fetchFromGitHub =

65− {owner = String; repo = String; rev = String; sha256 = String;} -> θ8;

65+ {owner = String; repo = String; rev = String; sha256 = String;} -> θ1;

6666 lib = ω;

67− python3 = δ4;

67+ python3 = δ1;

6868} ->

69−ι9

69+ι1

test/golden/importless/azure-agent.txt+2−2

@@ -1,4 +1,4 @@

1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3.

1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1.

22( α.config = β,

33 α.lib = γ,

44 α.pkgs = δ,

@@ -98,7 +98,7 @@

9898 { virtualisation =

9999 { azure =

100100 { agent =

101− {enable = ν; mountResourceDisk = β2; verboseLogging = γ3;};

101+ {enable = ν; mountResourceDisk = β1; verboseLogging = γ1;};

102102 };

103103 };

104104 };

test/golden/importless/compiler-rt.txt+12−12

@@ -1,5 +1,5 @@

1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3 δ4 ε5 ζ6 η7 θ8 ι9 κ10

2−λ11.

1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1 κ1

2+λ1.

33( α.hostPlatform = β,

44 α.isAarch32 = γ,

55 α.isDarwin = δ,

@@ -39,16 +39,16 @@

3939 ψ.lib = α,

4040 ω.lib = α,

4141 α1.hostPlatform = α,

42− β2.lib = α,

43− γ3.hostPlatform = α,

44− δ4.lib = α,

45− ε5.hostPlatform = α,

46− ζ6.lib = α,

47− η7.hostPlatform = α,

48− θ8.hostPlatform = α,

49− ι9.lib = α,

50− κ10.lib = α,

51− λ11.lib = α

42+ β1.lib = α,

43+ γ1.hostPlatform = α,

44+ δ1.lib = α,

45+ ε1.hostPlatform = α,

46+ ζ1.lib = α,

47+ η1.hostPlatform = α,

48+ θ1.hostPlatform = α,

49+ ι1.lib = α,

50+ κ1.lib = α,

51+ λ1.lib = α

5252) =>

5353{ cmake = η;

5454 fetch = String -> String -> κ;

test/golden/importless/configuration-ghc-head.txt+18−18

@@ -1,5 +1,5 @@

1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3 δ4 ε5 ζ6 η7 θ8 ι9 κ10

2−λ11 μ12 ν13 ξ14 ο15 π16 ρ17.

1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1 κ1

2+λ1 μ1 ν1 ξ1 ο1 π1 ρ1.

33( α.llvmPackages_6 = β,

44 γ.appendPatch = δ -> Path -> ε,

55 γ.doJailbreak = ζ -> η,

@@ -24,20 +24,20 @@

2424 κ.wl-pprint-extras = α1

2525) =>

2626{haskellLib = γ; pkgs = α;} ->

27−β2 ->

27+β1 ->

2828κ ->

2929{ Cabal = Null;

3030 Diff = ι;

3131 HaTeX = η;

32− RSA = γ3;

32+ RSA = γ1;

3333 array = Null;

3434 base = Null;

3535 binary = Null;

36− binary-orphans = δ4;

36+ binary-orphans = δ1;

3737 bytestring = Null;

3838 containers = Null;

39− data-clist = ε5;

40− dates = ζ6;

39+ data-clist = ε1;

40+ dates = ζ1;

4141 deepseq = Null;

4242 directory = Null;

4343 exceptions = Null;

@@ -50,33 +50,33 @@

5050 ghc-prim = Null;

5151 ghci = Null;

5252 git-annex = ε;

53− github = η7;

53+ github = η1;

5454 haskeline = Null;

5555 hpc = Null;

56− hpc-coveralls = θ8;

57− http-api-data = ι9;

56+ hpc-coveralls = θ1;

57+ http-api-data = ι1;

5858 integer-gmp = Null;

5959 libiserv = Null;

6060 llvmPackages = β;

61− monad-par = κ10;

61+ monad-par = κ1;

6262 mtl = Null;

6363 parsec = Null;

64− persistent-sqlite = λ11;

64+ persistent-sqlite = λ1;

6565 pretty = Null;

6666 process = Null;

6767 rts = Null;

68− skylighting-core = μ12;

69− stack = ν13;

68+ skylighting-core = μ1;

69+ stack = ν1;

7070 stm = Null;

71− system-fileio = ξ14;

71+ system-fileio = ξ1;

7272 template-haskell = Null;

7373 terminfo = Null;

7474 text = Null;

7575 time = Null;

7676 transformers = Null;

77− unicode-transforms = ο15;

77+ unicode-transforms = ο1;

7878 unix = Null;

79− unordered-containers = π16;

80− wl-pprint-extras = ρ17;

79+ unordered-containers = π1;

80+ wl-pprint-extras = ρ1;

8181 xhtml = Null;

8282}

test/golden/importless/contrib.txt+5−5

@@ -1,4 +1,4 @@

1−∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3 δ4 ε5.

1+∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1.

22( (β) // ({description = String; homepage = String;}) ~ (γ),

33 δ.lib = ε,

44 δ.mkDerivation =

@@ -51,13 +51,13 @@

5151 fetchurl = ω;

5252 grim = α1;

5353 installShellFiles = ι;

54− jq = β2;

55− libnotify = γ3;

54+ jq = β1;

55+ libnotify = γ1;

5656 makeWrapper = ι;

5757 python3Packages = ξ;

58− slurp = δ4;

58+ slurp = δ1;

5959 stdenv = δ;

6060 sway-unwrapped = ν;

61− wl-clipboard = ε5;

61+ wl-clipboard = ε1;

6262} ->

6363{grimshot = μ; inactive-windows-transparency = σ;}

test/golden/importless/enterprise-edition.txt+4−4

@@ -1,4 +1,4 @@

1−∀ γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3 δ4.

1+∀ γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1.

22( γ.lib = δ,

33 γ.mkDerivation =

44 { doInstallCheck = Bool;

@@ -42,14 +42,14 @@

4242 gtk2 = ψ;

4343 gtk3 = ω;

4444 libGL = α1;

45− libav_0_8 = β2;

46− pango = γ3;

45+ libav_0_8 = β1;

46+ pango = γ1;

4747 perl = η;

4848 requireFile = {name = String; sha256 = ∀ α. α; url = String;} -> κ;

4949 setJavaClassPath = ι;

5050 stdenv = γ;

5151 unzip = η;

52− xorg = δ4;

52+ xorg = δ1;

5353 zlib = ι;

5454} ->

5555{graalvm11-ee = θ; graalvm8-ee = θ;}

test/golden/importless/faust1.txt+7−7

@@ -1,4 +1,4 @@

1−∀ γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3 δ4 ε5 ζ6 η7.

1+∀ γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1.

22( ( γ

33 ) //

44 ( { dontBuild = Bool;

@@ -67,18 +67,18 @@

6767 π.magnetophon = ψ,

6868 π.maintainers = ω,

6969 π.map = (α1 -> String) -> [ι] -> υ,

70− π.platforms = β2,

70+ π.platforms = β1,

7171 π.pmahoney = ψ,

7272 π.src = δ,

7373 π.version = μ,

7474 π.wrap = κ,

7575 π.wrapWithBuildEnv = λ,

76− γ3.lib = ξ,

77− χ.gpl2 = δ4,

78− β2.linux = ε5

76+ γ1.lib = ξ,

77+ χ.gpl2 = δ1,

78+ β1.linux = ε1

7979) =>

80−{ coreutils = ζ6;

81− fetchurl = {sha256 = String; url = String;} -> η7;

80+{ coreutils = ζ1;

81+ fetchurl = {sha256 = String; url = String;} -> η1;

8282 makeWrapper = η;

8383 pkgconfig = θ;

8484 stdenv = ξ;

test/golden/importless/faust2.txt+9−9

@@ -1,4 +1,4 @@

1−∀ γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3 δ4 ε5 ζ6 η7 θ8 ι9.

1+∀ γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1.

22( ( γ

33 ) //

44 ( { dontBuild = Bool;

@@ -74,20 +74,20 @@

7474 ρ.licenses = ψ,

7575 ρ.magnetophon = ω,

7676 ρ.maintainers = α1,

77− ρ.map = (β2 -> String) -> [ι] -> φ,

78− ρ.platforms = γ3,

77+ ρ.map = (β1 -> String) -> [ι] -> φ,

78+ ρ.platforms = γ1,

7979 ρ.pmahoney = ω,

8080 ρ.src = δ,

8181 ρ.version = ν,

8282 ρ.wrap = λ,

8383 ρ.wrapWithBuildEnv = μ,

84− δ4.lib = ο,

85− ψ.gpl2 = ε5,

86− γ3.linux = ζ6,

87− η7.lib = ο

84+ δ1.lib = ο,

85+ ψ.gpl2 = ε1,

86+ γ1.linux = ζ1,

87+ η1.lib = ο

8888) =>

8989{ cmake = η;

90− coreutils = θ8;

90+ coreutils = θ1;

9191 emscripten = κ;

9292 fetchFromGitHub =

9393 { fetchSubmodules = Bool;

@@ -96,7 +96,7 @@

9696 rev = String;

9797 sha256 = String;

9898 } ->

99− ι9;

99+ ι1;

100100 gnutls = κ;

101101 libmicrohttpd = κ;

102102 libsndfile = κ;

test/golden/importless/fcitx.txt+10−10

@@ -1,4 +1,4 @@

1−∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3 δ4 ε5 ζ6 η7 θ8 ι9.

1+∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1.

22( (β) // ({check = γ -> Bool; name = String;}) ~ (δ),

33 ε.config = ζ,

44 ε.lib = η,

@@ -33,16 +33,16 @@

3333 ω,

3434 η.mkOption =

3535 {default = ∀ α. α; description = String; example = χ; type = φ;} -> α1,

36− η.types = β2,

37− γ3.fcitx = θ,

36+ η.types = β1,

37+ γ1.fcitx = θ,

3838 ο.engines = λ,

39− β2.package = β,

40− δ4.package = η,

41− ε5.types = δ4,

42− ζ6.inputMethod = ζ,

43− η7.i18n = ζ6,

44− θ8.inputMethod = ζ,

45− ι9.i18n = θ8

39+ β1.package = β,

40+ δ1.package = η,

41+ ε1.types = δ1,

42+ ζ1.inputMethod = ζ,

43+ η1.i18n = ζ1,

44+ θ1.inputMethod = ζ,

45+ ι1.i18n = θ1

4646) =>

4747ε ->

4848{config = ω; options = {i18n = {inputMethod = {fcitx = {engines = α1;};};};};}

test/golden/importless/frameworks.txt+33−33

@@ -1,5 +1,5 @@

1−∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3 δ4 ε5 ζ6 η7 θ8 ι9 κ10

2−λ11 μ12 ν13 ξ14 ο15 π16 ρ17 σ18 τ19 υ20 φ21 χ22 ψ23 ω24.

1+∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1 κ1 λ1

2+μ1 ν1 ξ1 ο1 π1 ρ1 σ1 τ1 υ1 φ1 χ1 ψ1 ω1 α2 β2 γ2 δ2 ε2 ζ2 η2 θ2.

33( β.Accelerate = γ,

44 β.AppKit = δ,

55 β.ApplicationServices = ε,

@@ -58,15 +58,15 @@

5858 ApplicationServices = [ν];

5959 AudioToolbox = [ι];

6060 AudioUnit = [α1];

61− AudioVideoBridging = [β2];

61+ AudioVideoBridging = [β1];

6262 Automator = ∀ α. α;

6363 CFNetwork = ∀ α. α;

6464 CalendarStore = ∀ α. α;

6565 Carbon = [π];

6666 Cocoa = [δ];

6767 Collaboration = ∀ α. α;

68− CoreAudio = [γ3];

69− CoreAudioKit = [δ4];

68+ CoreAudio = [γ1];

69+ CoreAudioKit = [δ1];

7070 CoreBluetooth = ∀ α. α;

7171 CoreData = ∀ α. α;

7272 CoreFoundation = ∀ α. α;

@@ -78,34 +78,34 @@

7878 CoreMedia = [ξ];

7979 CoreMediaIO = [λ];

8080 CoreServices = [η];

81− CoreText = [ε5];

82− CoreVideo = [ζ6];

81+ CoreText = [ε1];

82+ CoreVideo = [ζ1];

8383 CoreWLAN = [υ];

8484 DVDPlayback = ∀ α. α;

8585 DirectoryService = ∀ α. α;

86− DiscRecording = [η7];

86+ DiscRecording = [η1];

8787 DiscRecordingUI = ∀ α. α;

88− DiskArbitration = [θ8];

88+ DiskArbitration = [θ1];

8989 EventKit = ∀ α. α;

9090 ExceptionHandling = ∀ α. α;

9191 FWAUserLib = ∀ α. α;

92− ForceFeedback = [ι9];

92+ ForceFeedback = [ι1];

9393 Foundation = [χ];

9494 GLKit = ∀ α. α;

95− GLUT = [κ10];

95+ GLUT = [κ1];

9696 GSS = ∀ α. α;

9797 GameController = ∀ α. α;

98− GameKit = [λ11];

98+ GameKit = [λ1];

9999 Hypervisor = ∀ α. α;

100− ICADevices = [μ12];

100+ ICADevices = [μ1];

101101 IMServicePlugIn = ∀ α. α;

102− IOBluetooth = [ν13];

103− IOBluetoothUI = [ξ14];

102+ IOBluetooth = [ν1];

103+ IOBluetoothUI = [ξ1];

104104 IOKit = ∀ α. α;

105105 IOSurface = [φ];

106106 ImageCaptureCore = ∀ α. α;

107− ImageIO = [ο15];

108− InputMethodKit = [π16];

107+ ImageIO = [ο1];

108+ InputMethodKit = [π1];

109109 InstallerPlugins = ∀ α. α;

110110 InstantMessage = ∀ α. α;

111111 JavaFrameEmbedding = ∀ α. α;

@@ -114,48 +114,48 @@

114114 JavaScriptCore = ∀ α. α;

115115 JavaVM = ∀ α. α;

116116 Kerberos = ∀ α. α;

117− Kernel = [ρ17];

117+ Kernel = [ρ1];

118118 LDAP = ∀ α. α;

119− LatentSemanticMapping = [σ18];

119+ LatentSemanticMapping = [σ1];

120120 LocalAuthentication = ∀ α. α;

121121 MapKit = ∀ α. α;

122− MediaAccessibility = [τ19];

122+ MediaAccessibility = [τ1];

123123 MediaPlayer = ∀ α. α;

124− MediaToolbox = [υ20];

124+ MediaToolbox = [υ1];

125125 Metal = ∀ α. α;

126126 MetalKit = [σ];

127127 ModelIO = ∀ α. α;

128128 NetFS = ∀ α. α;

129− OSAKit = [φ21];

129+ OSAKit = [φ1];

130130 OpenAL = ∀ α. α;

131− OpenCL = [χ22];

131+ OpenCL = [χ1];

132132 OpenDirectory = ∀ α. α;

133133 OpenGL = ∀ α. α;

134− PCSC = [ψ23];

134+ PCSC = [ψ1];

135135 PreferencePanes = ∀ α. α;

136136 PubSub = ∀ α. α;

137137 QTKit = [μ];

138138 Quartz = [τ];

139139 QuartzCore = [κ];

140− QuickLook = [ω24];

141− QuickTime = [〚5 47〛];

140+ QuickLook = [ω1];

141+ QuickTime = [α2];

142142 SceneKit = ∀ α. α;

143143 ScreenSaver = ∀ α. α;

144144 Scripting = ∀ α. α;

145145 ScriptingBridge = ∀ α. α;

146− Security = [〚5 48〛];

146+ Security = [β2];

147147 SecurityFoundation = ∀ α. α;

148− SecurityInterface = [〚5 49〛];

149− ServiceManagement = [〚5 50〛];

148+ SecurityInterface = [γ2];

149+ ServiceManagement = [δ2];

150150 Social = ∀ α. α;

151151 SpriteKit = ∀ α. α;

152152 StoreKit = ∀ α. α;

153153 SyncServices = ∀ α. α;

154− SystemConfiguration = [〚5 51〛];

155− TWAIN = [〚5 52〛];

154+ SystemConfiguration = [ε2];

155+ TWAIN = [ζ2];

156156 Tcl = ∀ α. α;

157− VideoDecodeAcceleration = [〚5 53〛];

158− VideoToolbox = [〚5 54〛];

157+ VideoDecodeAcceleration = [η2];

158+ VideoToolbox = [θ2];

159159 WebKit = [ρ];

160160 vmnet = ∀ α. α;

161161}

test/golden/importless/gateone.txt+3−3

@@ -1,4 +1,4 @@

1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3.

1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1.

22( α.config = β,

33 α.lib = γ,

44 α.pkgs = δ,

@@ -52,10 +52,10 @@

5252 ψ.uids = β,

5353 ω.ids = ψ,

5454 σ.path = ο,

55− α1.path = β2

55+ α1.path = β1

5656) =>

5757α ->

5858{ config = ξ;

5959 options =

60− {services = {gateone = {enable = θ; pidDir = π; settingsDir = γ3;};};};

60+ {services = {gateone = {enable = θ; pidDir = π; settingsDir = γ1;};};};

6161}

test/golden/importless/generations-dir.txt+2−2

@@ -1,4 +1,4 @@

1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2.

1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1.

22( α.config = β,

33 α.lib = γ,

44 α.pkgs = δ,

@@ -37,5 +37,5 @@

3737α ->

3838{ config = ι;

3939 options =

40− {boot = {loader = {generationsDir = {copyKernels = λ; enable = β2;};};};};

40+ {boot = {loader = {generationsDir = {copyKernels = λ; enable = β1;};};};};

4141}

test/golden/importless/generic-v3.txt+5−5

@@ -1,4 +1,4 @@

1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3 δ4.

1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1.

22( α.autoreconfHook = Null,

33 α.buildPackages = β,

44 α.fetchFromGitHub =

@@ -67,12 +67,12 @@

6767 ψ.lib = χ,

6868 ω.platforms = σ,

6969 α1.lib = ω,

70− β2.lib = σ,

71− ζ.buildPlatform = γ3,

72− ζ.hostPlatform = γ3,

70+ β1.lib = σ,

71+ ζ.buildPlatform = γ1,

72+ ζ.hostPlatform = γ1,

7373 β.cc = Null,

7474 β.stdenv = σ,

7575 β.which = Null,

76− δ4.stdenv = β

76+ δ1.stdenv = β

7777) =>

7878α -> μ

test/golden/importless/gui.txt+2−2

@@ -1,4 +1,4 @@

1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2.

1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1.

22( α.composeExtensions = β,

33 α.foldr = β -> (γ -> δ -> {}) -> [ε] -> ζ,

44 α.licenses = η,

@@ -44,7 +44,7 @@

4444 mkOverride = ψ;

4545 sha256Hash = ω;

4646 stable = α1;

47− version = β2;

47+ version = β1;

4848} ->

4949{ fetchFromGitHub =

5050 {owner = String; repo = String; rev = String; sha256 = ω;} -> ρ;

test/golden/importless/licenses.txt+2−2

@@ -1,4 +1,4 @@

1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2.

1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1.

22( (α) // ({shortName = β;}) ~ (γ),

33 ( δ

44 ) //

@@ -197,6 +197,6 @@

197197 ψ.licenses = π,

198198 ω.licenses = π,

199199 α1.licenses = π,

200− β2.licenses = π

200+ β1.licenses = π

201201) =>

202202{lib = π;} -> ο

test/golden/importless/liquidsoap.txt+14−14

@@ -1,5 +1,5 @@

1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3 δ4 ε5 ζ6 η7 θ8 ι9 κ10

2−λ11 μ12 ν13 ξ14 ο15.

1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1 κ1

2+λ1 μ1 ν1 ξ1 ο1.

33( α.config = β,

44 α.lib = γ,

55 α.pkgs = δ,

@@ -52,17 +52,17 @@

5252 φ.liquidsoap = β,

5353 χ.services = φ,

5454 ψ.getAttr = ι -> ω -> α1,

55− β2.liquidsoap = β,

56− γ3.services = β2,

57− δ4.length = λ -> Integer,

58− ε5.listToAttrs = μ -> ν,

59− ζ6.gids = β,

60− η7.ids = ζ6,

61− θ8.uids = β,

62− ι9.ids = θ8,

63− υ.attrsOf = κ10 -> σ,

64− λ11.either = μ12 -> ν13 -> κ10,

65− ξ14.path = μ12,

66− ο15.str = ν13

55+ β1.liquidsoap = β,

56+ γ1.services = β1,

57+ δ1.length = λ -> Integer,

58+ ε1.listToAttrs = μ -> ν,

59+ ζ1.gids = β,

60+ η1.ids = ζ1,

61+ θ1.uids = β,

62+ ι1.ids = θ1,

63+ υ.attrsOf = κ1 -> σ,

64+ λ1.either = μ1 -> ν1 -> κ1,

65+ ξ1.path = μ1,

66+ ο1.str = ν1

6767) =>

6868α -> {config = ο; options = {services = {liquidsoap = {streams = τ;};};};}

test/golden/importless/master.txt+3−3

@@ -1,4 +1,4 @@

1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3.

1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1.

22( α.config = β,

33 α.lib = γ,

44 α.pkgs = δ,

@@ -44,8 +44,8 @@

4444 ω.services = ψ,

4545 κ.toJSON = φ -> η,

4646 α1.salt/master = β,

47− β2.etc = α1,

48− γ3.environment = β2,

47+ β1.etc = α1,

48+ γ1.environment = β1,

4949 χ.attrs = σ

5050) =>

5151α ->

test/golden/importless/mavenPlugins.txt+17−17

@@ -1,5 +1,5 @@

1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3 δ4 ε5 ζ6 η7 θ8 ι9 κ10

2−λ11 μ12 ν13 ξ14 ο15 π16 ρ17 σ18 τ19.

1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1 κ1

2+λ1 μ1 ν1 ξ1 ο1 π1 ρ1 σ1 τ1.

33( α.callPackage =

44 Path ->

55 {} ->

@@ -26,12 +26,12 @@

2626 υ.type = χ,

2727 ψ.sha512 = ω,

2828 ψ.type = α1,

29− β2.sha512 = γ3,

30− β2.type = δ4,

31− ε5.sha512 = ζ6,

32− ε5.type = η7,

33− θ8.sha512 = ι9,

34− θ8.type = κ10

29+ β1.sha512 = γ1,

30+ β1.type = δ1,

31+ ε1.sha512 = ζ1,

32+ ε1.type = η1,

33+ θ1.sha512 = ι1,

34+ θ1.type = κ1

3535) =>

3636{pkgs = α;} ->

3737{ animalSniffer_1_11 = η;

@@ -43,13 +43,13 @@

4343 version = String;

4444 } ->

4545 δ;

46− mavenClean_2_5 = λ11;

47− mavenCompiler_3_1 = μ12;

48− mavenEnforcer_1_3_1 = ν13;

49− mavenInstall_2_4 = ξ14;

50− mavenJar_2_4 = ο15;

51− mavenReplacer_1_5_3 = π16;

52− mavenResources_2_6 = ρ17;

53− mavenSurefire_2_12_4 = σ18;

54− mavenSurefire_2_17 = τ19;

46+ mavenClean_2_5 = λ1;

47+ mavenCompiler_3_1 = μ1;

48+ mavenEnforcer_1_3_1 = ν1;

49+ mavenInstall_2_4 = ξ1;

50+ mavenJar_2_4 = ο1;

51+ mavenReplacer_1_5_3 = π1;

52+ mavenResources_2_6 = ρ1;

53+ mavenSurefire_2_12_4 = σ1;

54+ mavenSurefire_2_17 = τ1;

5555}

test/golden/importless/mjpg-streamer.txt+4−4

@@ -1,4 +1,4 @@

1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3 δ4.

1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1.

22( α.config = β,

33 α.lib = γ,

44 α.pkgs = δ,

@@ -45,9 +45,9 @@

4545 { mjpg-streamer =

4646 { enable = ζ;

4747 group = ν;

48− inputPlugin = β2;

49− outputPlugin = γ3;

50− user = δ4;

48+ inputPlugin = β1;

49+ outputPlugin = γ1;

50+ user = δ1;

5151 };

5252 };

5353 };

test/golden/importless/no-x-libs.txt+10−11

@@ -1,5 +1,4 @@

1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3 δ4 ε5 ζ6 η7 θ8 ι9

2−κ10.

1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1 κ1.

32( α.config = β,

43 α.lib = γ,

54 δ.override = ε,

@@ -34,14 +33,14 @@

3433 ω.environment = β,

3534 ψ.bool = φ,

3635 α1.cairo = δ,

37− β2.dbus = δ,

38− γ3.gobject-introspection = δ,

39− δ4.networkmanager-fortisslvpn = δ,

40− ε5.networkmanager-iodine = δ,

41− ζ6.networkmanager-l2tp = δ,

42− η7.networkmanager-openconnect = δ,

43− θ8.networkmanager-openvpn = δ,

44− ι9.networkmanager-vpnc = δ,

45− κ10.qemu = δ

36+ β1.dbus = δ,

37+ γ1.gobject-introspection = δ,

38+ δ1.networkmanager-fortisslvpn = δ,

39+ ε1.networkmanager-iodine = δ,

40+ ζ1.networkmanager-l2tp = δ,

41+ η1.networkmanager-openconnect = δ,

42+ θ1.networkmanager-openvpn = δ,

43+ ι1.networkmanager-vpnc = δ,

44+ κ1.qemu = δ

4645) =>

4746α -> {config = υ; options = {environment = {noXlibs = χ;};};}

test/golden/importless/nscd.txt+13−14

@@ -1,5 +1,5 @@

1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3 δ4 ε5 ζ6 η7 θ8 ι9 κ10

2−λ11 μ12 ν13.

1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1 κ1

2+λ1 μ1 ν1.

33( α.config = β,

44 α.lib = γ,

55 α.pkgs = δ,

@@ -46,18 +46,17 @@

4646 ε.config = κ,

4747 ε.enable = ι,

4848 α1.services = β,

49− β2.hosts = β,

50− γ3.etc = β2,

51− δ4.environment = γ3,

52− ε5.nsswitch.conf = β,

53− ζ6.etc = ε5,

54− η7.environment = ζ6,

55− θ8.nscd.conf = β,

56− ι9.etc = θ8,

57− κ10.environment = ι9,

49+ β1.hosts = β,

50+ γ1.etc = β1,

51+ δ1.environment = γ1,

52+ ε1.nsswitch.conf = β,

53+ ζ1.etc = ε1,

54+ η1.environment = ζ1,

55+ θ1.nscd.conf = β,

56+ ι1.etc = θ1,

57+ κ1.environment = ι1,

5858 θ.readFile = Path -> μ,

5959 ο.lines = ν,

60− λ11.bool = μ12

60+ λ1.bool = μ1

6161) =>

62−α ->

63−{config = λ; options = {services = {nscd = {config = ξ; enable = ν13;};};};}

62+α -> {config = λ; options = {services = {nscd = {config = ξ; enable = ν1;};};};}

test/golden/importless/qtwebengine.txt+45−45

@@ -1,5 +1,5 @@

1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3 δ4 ε5 ζ6 η7 θ8 ι9 κ10

2−λ11 μ12 ν13 ξ14 ο15 π16 ρ17.

1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1 θ1 ι1 κ1

2+λ1 μ1 ν1 ξ1 ο1 π1 ρ1.

33( α.libXcomposite = β,

44 α.libXdamage = β,

55 α.libpciaccess = β,

@@ -40,20 +40,20 @@

4040 ν.platforms = ψ,

4141 ω.cc = λ,

4242 α1.gcc = λ,

43− β2.platform = α1,

44− γ3.hostPlatform = β2,

45− ψ.unix = δ4,

46− ε5.hostPlatform = λ,

47− ζ6.hostPlatform = λ,

48− ο.frameworks = η7,

49− θ8.hostPlatform = λ,

50− ι9.hostPlatform = λ

43+ β1.platform = α1,

44+ γ1.hostPlatform = β1,

45+ ψ.unix = δ1,

46+ ε1.hostPlatform = λ,

47+ ζ1.hostPlatform = λ,

48+ ο.frameworks = η1,

49+ θ1.hostPlatform = λ,

50+ ι1.hostPlatform = λ

5151) =>

5252{ alsaLib = β;

53− bison = κ10;

54− coreutils = κ10;

53+ bison = κ1;

54+ coreutils = κ1;

5555 cups = φ;

56− darwin = λ11;

56+ darwin = λ1;

5757 dbus = β;

5858 enableProprietaryCodecs = Bool;

5959 fetchpatch =

@@ -63,16 +63,16 @@

6363 stripLen = Integer;

6464 url = String;

6565 } ->

66− μ12;

66+ μ1;

6767 ffmpeg_3 = Null;

68− flex = κ10;

68+ flex = κ1;

6969 fontconfig = β;

7070 freetype = β;

71− git = κ10;

72− gn = κ10;

73− gperf = κ10;

74− harfbuzz = ν13;

75− icu = ν13;

71+ git = κ1;

72+ gn = κ1;

73+ gperf = κ1;

74+ harfbuzz = ν1;

75+ icu = ν1;

7676 jsoncpp = β;

7777 lib = γ;

7878 libXScrnSaver = β;

@@ -81,21 +81,21 @@

8181 libXtst = β;

8282 libcap = β;

8383 libdrm = β;

84− libevent = ν13;

85− libjpeg = ν13;

86− libopus = ν13;

87− libpng = ν13;

88− libtiff = ν13;

89− libvpx = ν13;

90− libwebp = ν13;

84+ libevent = ν1;

85+ libjpeg = ν1;

86+ libopus = ν1;

87+ libpng = ν1;

88+ libtiff = ν1;

89+ libvpx = ν1;

90+ libwebp = ν1;

9191 minizip = β;

92− ninja = κ10;

92+ ninja = κ1;

9393 nss = β;

9494 openbsm = ξ;

9595 pciutils = β;

96− pkgconfig = κ10;

96+ pkgconfig = κ1;

9797 protobuf = β;

98− python2 = κ10;

98+ python2 = κ1;

9999 qtCompatVersion = θ;

100100 qtModule =

101101 { NIX_CFLAGS_COMPILE = [η];

@@ -108,32 +108,32 @@

108108 dontUseXcbuild = Bool;

109109 enableParallelBuilding = Bool;

110110 hardeningDisable = [String];

111− meta = {description = String; maintainers = [ρ]; platforms = δ4;};

111+ meta = {description = String; maintainers = [ρ]; platforms = δ1;};

112112 name = String;

113− nativeBuildInputs = [κ10];

113+ nativeBuildInputs = [κ1];

114114 outputs = [String];

115− patches = [μ12];

115+ patches = [μ1];

116116 postInstall = ε;

117117 postPatch = String;

118118 preConfigure = String;

119− propagatedBuildInputs = [ν13];

119+ propagatedBuildInputs = [ν1];

120120 qmakeFlags = [String];

121− qtInputs = [ξ14];

121+ qtInputs = [ξ1];

122122 } ->

123− ο15;

124− qtdeclarative = ξ14;

125− qtlocation = ξ14;

126− qtquickcontrols = ξ14;

127− qtwebchannel = ξ14;

123+ ο1;

124+ qtdeclarative = ξ1;

125+ qtlocation = ξ1;

126+ qtquickcontrols = ξ1;

127+ qtwebchannel = ξ1;

128128 runCommand = String -> {} -> String -> φ;

129129 snappy = β;

130− srtp = ν13;

130+ srtp = ν1;

131131 stdenv = λ;

132− systemd = π16;

133− which = κ10;

132+ systemd = π1;

133+ which = κ1;

134134 writeScriptBin = String -> String -> φ;

135− xcbuild = ρ17;

135+ xcbuild = ρ1;

136136 xorg = α;

137137 zlib = β;

138138} ->

139−ο15

139+ο1

test/golden/importless/shadow.txt+5−5

@@ -1,4 +1,4 @@

1−∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3 δ4 ε5 ζ6.

1+∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1.

22( ( { newgidmap = {source = String;};

33 newgrp = {source = String;};

44 newuidmap = {source = String;};

@@ -30,14 +30,14 @@

3030 χ.users = ε,

3131 ψ.users = ε,

3232 ω.users = ε,

33− α1.either = β2 -> γ3 -> μ,

34− δ4.path = β2,

35− ε5.shellPackage = γ3

33+ α1.either = β1 -> γ1 -> μ,

34+ δ1.path = β1,

35+ ε1.shellPackage = γ1

3636) =>

3737δ ->

3838{ config =

3939 { environment =

40− { etc = {default/useradd = {source = σ;}; login.defs = {source = ζ6;};};

40+ { etc = {default/useradd = {source = σ;}; login.defs = {source = ζ1;};};

4141 systemPackages = [ο];

4242 };

4343 security =

test/golden/importless/shared.txt+8−8

@@ -1,4 +1,4 @@

1−∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3 δ4 ε5 ζ6 η7.

1+∀ β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1 δ1 ε1 ζ1 η1.

22( β.arch = String,

33 β.isDarwin = Bool,

44 β.lib = γ,

@@ -53,24 +53,24 @@

5353 ψ.lib = β,

5454 ω.gcc = β,

5555 α1.platform = ω,

56− β2.hostPlatform = α1,

57− γ3.lib = β

56+ β1.hostPlatform = α1,

57+ γ1.lib = β

5858) =>

5959{ libuvSha256 = String;

60− libuvVersion = δ4;

60+ libuvVersion = δ1;

6161 maintenanceVersion = κ;

6262 majorVersion = λ;

6363 minorVersion = μ;

64− src_sha256 = ε5;

64+ src_sha256 = ε1;

6565} ->

6666{ ApplicationServices = π;

6767 CoreServices = π;

6868 arpack = η;

6969 blas = η;

70− cmake = ζ6;

70+ cmake = ζ1;

7171 curl = ι;

72− fetchurl = {sha256 = String; url = String;} -> η7;

73− fetchzip = {sha256 = ε5; url = String;} -> ν;

72+ fetchurl = {sha256 = String; url = String;} -> η1;

73+ fetchzip = {sha256 = ε1; url = String;} -> ν;

7474 fftw = η;

7575 fftwSinglePrec = η;

7676 gfortran = ι;

test/golden/importless/utils.txt+3−3

@@ -1,4 +1,4 @@

1−∀ γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3.

1+∀ γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1.

22( γ.lib = δ,

33 ε.mountPoint = ζ,

44 ε.neededForBoot = η,

@@ -22,8 +22,8 @@

2222 δ.types = ω,

2323 ω.check = String -> Bool,

2424 α1.shellPackage = ω,

25− β2.check = String -> Bool,

26− γ3.package = β2

25+ β1.check = String -> Bool,

26+ γ1.package = β1

2727) =>

2828γ ->

2929{ escapeSystemdPath = φ -> ψ;

test/golden/importless/virtualbox-guest.txt+3−3

@@ -1,4 +1,4 @@

1−∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β2 γ3.

1+∀ α β γ δ ε ζ η θ ι κ λ μ ν ξ ο π ρ σ τ υ φ χ ψ ω α1 β1 γ1.

22( α.config = β,

33 α.lib = γ,

44 α.pkgs = δ,

@@ -47,10 +47,10 @@

4747 ψ.gids = β,

4848 ω.ids = ψ,

4949 π.bool = ν,

50− α1.bool = β2

50+ α1.bool = β1

5151) =>

5252α ->

5353{ config = κ;

5454 options =

55− {virtualisation = {virtualbox = {guest = {enable = ξ; x11 = γ3;};};};};

55+ {virtualisation = {virtualbox = {guest = {enable = ξ; x11 = γ1;};};};};

5656}