Skip to content
Snippets Groups Projects
Commit 923bac3b authored by Matthew Pickering's avatar Matthew Pickering
Browse files

Update head.hackage nixpkgs and compiler versions to newer versions

parent a36547ab
No related branches found
No related tags found
No related merge requests found
...@@ -5,17 +5,15 @@ in ...@@ -5,17 +5,15 @@ in
with nixpkgs; with nixpkgs;
let let
haskellPackages = nixpkgs.haskellPackages.override { all-cabal-hashes = sources.all-cabal-hashes.outPath; }; haskellPackages = nixpkgs.haskell.packages.ghc925.override { all-cabal-hashes = sources.all-cabal-hashes.outPath; };
hackage-repo-tool = hackage-repo-tool =
let src = sources.hackage-security.outPath; let src = sources.hackage-security.outPath;
in haskellPackages.callCabal2nix "hackage-repo-tool" "${src}/hackage-repo-tool" { in nixpkgs.haskell.lib.doJailbreak (haskellPackages.callCabal2nix "hackage-repo-tool" "${src}/hackage-repo-tool" {});
optparse-applicative = haskellPackages.callHackage "optparse-applicative" "0.15.1.0" {};
};
overlay-tool = overlay-tool =
let src = sources.overlay-tool; let src = sources.overlay-tool;
in haskellPackages.callCabal2nix "hackage-overlay-repo-tool" src { }; in nixpkgs.haskell.lib.doJailbreak (haskellPackages.callCabal2nix "hackage-overlay-repo-tool" src { });
head-hackage-ci = head-hackage-ci =
let let
......
...@@ -19,7 +19,7 @@ executable head-hackage-ci ...@@ -19,7 +19,7 @@ executable head-hackage-ci
aeson, aeson,
ansi-wl-pprint, ansi-wl-pprint,
async, async,
base >=4.11 && <4.16, base >=4.11 && <5,
bytestring, bytestring,
cabal-plan, cabal-plan,
containers, containers,
......
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
"homepage": null, "homepage": null,
"owner": "commercialhaskell", "owner": "commercialhaskell",
"repo": "all-cabal-hashes", "repo": "all-cabal-hashes",
"rev": "3a406043fb5586e6016440b65759b10b036cdb4f", "rev": "b0a2944a580a29defa7e68ebc6298bf9d851d86a",
"sha256": "1c2hvz1h14w8s4qxlrrnpsbdi3a712d49w257lgifabh57s94zrb", "sha256": "163m68dcqc0i13s631g18sx5phgabjcvkl0nvkmcgsaqd8fnbzfc",
"type": "file", "type": "file",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3a406043fb5586e6016440b65759b10b036cdb4f.tar.gz", "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/b0a2944a580a29defa7e68ebc6298bf9d851d86a.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"ghc-artefact-nix": { "ghc-artefact-nix": {
...@@ -53,10 +53,10 @@ ...@@ -53,10 +53,10 @@
"homepage": "", "homepage": "",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4418f362e68c69226807a5837fcbfc94f0b92adb", "rev": "33e0d99cbedf2acfd7340d2150837fbb28039a64",
"sha256": "1lh31mnx55c1yh070m0r3xmm39wfzi4mh9fdi8rn31wjzkrzxgrn", "sha256": "15ll14rycfarqd7isyfms1fhszw9k36ars58gvdw3bkka5mj48cr",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/4418f362e68c69226807a5837fcbfc94f0b92adb.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/33e0d99cbedf2acfd7340d2150837fbb28039a64.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"overlay-tool": { "overlay-tool": {
......
...@@ -9,11 +9,11 @@ ...@@ -9,11 +9,11 @@
# #
let let
# To update nixpkgs bump rev and baseNixpkgs's sha256. # To update nixpkgs bump rev and baseNixpkgs's sha256.
rev = "2f746bc1fcdc24b103bda3a27ed82c23200cc077"; rev = "33e0d99cbedf2acfd7340d2150837fbb28039a64";
baseNixpkgs = baseNixpkgs =
fetchTarball { fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz"; url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
sha256 = "142yl6xakkwmyy8x32h94fci4x09l0yqppq5hwj19a3nmd0zmsjx"; sha256 = "042yl6xakkwmyy8x32h94fci4x09l0yqppq5hwj19a3nmd0zmsjx";
}; };
in in
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment