41682ea · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

update pins (#1371)

41682eaHamish Mackenzie5 years ago

builder/default.nix+14−8

compare with iko/ghcjs-patch-master

unifiedsplit

@@ -46,17 +46,23 @@ let

46 hoogleLocal = let

47 nixpkgsHoogle = import (pkgs.path + /pkgs/development/haskell-modules/hoogle.nix);

48 in { packages ? [], hoogle ? pkgs.buildPackages.haskell-nix.tool "ghc8107" "hoogle" {

49− version = "5.0.18.2";

49+ version = "5.0.18.3";

50 index-state = pkgs.haskell-nix.internalHackageIndexState;

51 }

52 }:

53− haskellLib.weakCallPackage pkgs nixpkgsHoogle {

53+ let

54+ haskellPackages = {

54− # For musl we can use haddock from the buildGHC

55+ # For musl we can use haddock from the buildGHC

55− ghc = if stdenv.hostPlatform.isLinux && stdenv.targetPlatform.isMusl && !haskellLib.isNativeMusl

56+ ghc = if stdenv.hostPlatform.isLinux && stdenv.targetPlatform.isMusl && !haskellLib.isNativeMusl

56− then ghc.buildGHC

57+ then ghc.buildGHC

57− else ghc;

58+ else ghc;

58− inherit packages hoogle;

59+ inherit packages hoogle;

59− };

60+ };

61+ in if lib.versionAtLeast lib.trivial.release "22.05"

62+ then haskellLib.weakCallPackage pkgs nixpkgsHoogle {

63+ inherit haskellPackages;

64+ } (p: p.packages)

65+ else haskellLib.weakCallPackage pkgs nixpkgsHoogle haskellPackages;

61 # Same as haskellPackages.shellFor in nixpkgs.

67 # Same as haskellPackages.shellFor in nixpkgs.

62 shellFor = haskellLib.weakCallPackage pkgs ./shell-for.nix {

68 shellFor = haskellLib.weakCallPackage pkgs ./shell-for.nix {

flake.lock+21−21

@@ -20,10 +20,10 @@

20 "flake": false,

21 "locked": {

22 "lastModified": 1603716527,

23− "narHash": "sha256-sDbrmur9Zfp4mPKohCD8IDZfXJ0Tjxpmr2R+kg5PpSY=",

23+ "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=",

24 "owner": "haskell",

25 "repo": "cabal",

26− "rev": "94aaa8e4720081f9c75497e2735b90f6a819b08e",

26+ "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee",

27 "type": "github"

28 },

29 "original": {

@@ -36,11 +36,11 @@

36 "cabal-34": {

37 "flake": false,

38 "locked": {

39− "lastModified": 1622475795,

39+ "lastModified": 1640353650,

40− "narHash": "sha256-chwTL304Cav+7p38d9mcb+egABWmxo2Aq+xgVBgEb/U=",

40+ "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=",

41 "owner": "haskell",

42 "repo": "cabal",

43− "rev": "b086c1995cdd616fc8d91f46a21e905cc50a1049",

43+ "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd",

44 "type": "github"

45 },

46 "original": {

@@ -53,11 +53,11 @@

53 "cabal-36": {

54 "flake": false,

55 "locked": {

56− "lastModified": 1640163203,

56+ "lastModified": 1641652457,

57− "narHash": "sha256-TwDWP2CffT0j40W6zr0J1Qbu+oh3nsF1lUx9446qxZM=",

57+ "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=",

58 "owner": "haskell",

59 "repo": "cabal",

60− "rev": "ecf418050c1821f25e2e218f1be94c31e0465df1",

60+ "rev": "f27667f8ec360c475027dcaee0138c937477b070",

61 "type": "github"

62 },

63 "original": {

@@ -85,11 +85,11 @@

85 },

86 "flake-utils": {

87 "locked": {

88− "lastModified": 1623875721,

88+ "lastModified": 1644229661,

89− "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",

89+ "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",

90 "owner": "numtide",

91 "repo": "flake-utils",

92− "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",

92+ "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",

93 "type": "github"

94 },

95 "original": {

@@ -181,11 +181,11 @@

181 },

182 "nixpkgs-2105": {

183 "locked": {

184− "lastModified": 1640283157,

184+ "lastModified": 1642244250,

185− "narHash": "sha256-6Ddfop+rKE+Gl9Tjp9YIrkfoYPzb8F80ergdjcq3/MY=",

185+ "narHash": "sha256-vWpUEqQdVP4srj+/YLJRTN9vjpTs4je0cdWKXPbDItc=",

186 "owner": "NixOS",

187 "repo": "nixpkgs",

188− "rev": "dde1557825c5644c869c5efc7448dc03722a8f09",

188+ "rev": "0fd9ee1aa36ce865ad273f4f07fdc093adeb5c00",

189 "type": "github"

190 },

191 "original": {

@@ -197,11 +197,11 @@

197 },

198 "nixpkgs-2111": {

199 "locked": {

200− "lastModified": 1640283207,

200+ "lastModified": 1644510859,

201− "narHash": "sha256-SCwl7ZnCfMDsuSYvwIroiAlk7n33bW8HFfY8NvKhcPA=",

201+ "narHash": "sha256-xjpVvL5ecbyi0vxtVl/Fh9bwGlMbw3S06zE5nUzFB8A=",

202 "owner": "NixOS",

203 "repo": "nixpkgs",

204− "rev": "64c7e3388bbd9206e437713351e814366e0c3284",

204+ "rev": "0d1d5d7e3679fec9d07f2eb804d9f9fdb98378d3",

205 "type": "github"

206 },

207 "original": {

@@ -213,11 +213,11 @@

213 },

214 "nixpkgs-unstable": {

215 "locked": {

216− "lastModified": 1641285291,

216+ "lastModified": 1644486793,

217− "narHash": "sha256-KYaOBNGar3XWTxTsYPr9P6u74KAqNq0wobEC236U+0c=",

217+ "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=",

218 "owner": "NixOS",

219 "repo": "nixpkgs",

220− "rev": "0432195a4b8d68faaa7d3d4b355260a3120aeeae",

220+ "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292",

221 "type": "github"

222 },

223 "original": {

@@ -257,7 +257,7 @@

257 "hpc-coveralls": "hpc-coveralls",

258 "nix-tools": "nix-tools",

259 "nixpkgs": [

260− "nixpkgs-2111"

260+ "nixpkgs-unstable"

261 ],

262 "nixpkgs-2003": "nixpkgs-2003",

263 "nixpkgs-2105": "nixpkgs-2105",

flake.nix+1−1

@@ -2,7 +2,7 @@

2 description = "Alternative Haskell Infrastructure for Nixpkgs";

4 inputs = {

5− nixpkgs.follows = "nixpkgs-2111";

5+ nixpkgs.follows = "nixpkgs-unstable";

6 nixpkgs-2003 = { url = "github:NixOS/nixpkgs/nixpkgs-20.03-darwin"; };

7 nixpkgs-2105 = { url = "github:NixOS/nixpkgs/nixpkgs-21.05-darwin"; };

8 nixpkgs-2111 = { url = "github:NixOS/nixpkgs/nixpkgs-21.11-darwin"; };

scripts/options-doc.nix+1−1

@@ -22,7 +22,7 @@ let

22 singleMarkdown = name: value: ''

23 ## ${name}

25− ${value.description}

25+ ${lib.optionalString (value.description != null) value.description}

27 **Type**: ${value.type}