From bc9e5b0ea863a17537987faa5a72b00efc7767d1 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Mon, 18 Jul 2022 22:09:58 -0400 Subject: Upgrade nixpkgs, ghc923 I ended up deleting miso, and consequently all files under Hero/ and Miso/, because I couldn't get miso to build with GHC 9.2. Other things: - Niv has been wrapped by Biz/Bild/Deps.hs, so I can extend it to my liking. - Apply-refact is gone because I couldn't get it to build. - Disabled python stuff. --- Biz/Bild/Constants.nix | 2 +- Biz/Bild/Deps.hs | 16 ++++++++++++ Biz/Bild/Deps.nix | 10 ++++++-- Biz/Bild/Deps/Haskell.nix | 3 +-- Biz/Bild/Nixpkgs.nix | 7 +++++ Biz/Bild/Sources.json | 65 ++++++++++------------------------------------- 6 files changed, 46 insertions(+), 57 deletions(-) create mode 100644 Biz/Bild/Deps.hs (limited to 'Biz/Bild') diff --git a/Biz/Bild/Constants.nix b/Biz/Bild/Constants.nix index 652e022..0ffc85d 100644 --- a/Biz/Bild/Constants.nix +++ b/Biz/Bild/Constants.nix @@ -1,4 +1,4 @@ { - ghcCompiler = "ghc8104"; + ghcCompiler = "ghc923"; ghcjsCompiler = "ghcjs86"; } diff --git a/Biz/Bild/Deps.hs b/Biz/Bild/Deps.hs new file mode 100644 index 0000000..908f188 --- /dev/null +++ b/Biz/Bild/Deps.hs @@ -0,0 +1,16 @@ +{-# LANGUAGE LambdaCase #-} + +-- | A specific-purpose dependency manager. +-- +-- : out deps +module Biz.Bild.Deps where + +import Alpha +import qualified Niv.Cli +import qualified System.Environment as Env + +main :: IO () +main = + Env.getArgs +> \case + ["test"] -> pure () + _ -> Niv.Cli.cli diff --git a/Biz/Bild/Deps.nix b/Biz/Bild/Deps.nix index 4f16250..84639b5 100644 --- a/Biz/Bild/Deps.nix +++ b/Biz/Bild/Deps.nix @@ -14,11 +14,17 @@ in rec overrides = with super.pkgs.haskell.lib; sel: sup: super.overridePinnedDeps (buildCabal sel) // { acid-state = dontCheck sup.acid-state; # mac: "too many open files" + clay = doJailbreak sup.clay; + envy = doJailbreak sup.envy; + fast-tags = sup.fast-tags.overrideAttrs (old: old // { patches = []; }); + generic-data = dontCheck sup.generic-data; # https://github.com/Lysxia/generic-data/issues/56 ghcjs-base = null; # otherwise ghc tries to build this via overridePinnedDeps - servant-auth = buildCabalSubdir sel {name = "servant-auth";}; + readable = doJailbreak sup.readable; # why is this even being built? + servant-auth = doJailbreak (buildCabalSubdir sel {name = "servant-auth"; subdir = "servant-auth/servant-auth";}); servant-server = doJailbreak sup.servant-server; + stripe-core = doJailbreak sup.stripe-core; stripe-haskell = dontCheck sup.stripe-haskell; - stripe-http-client = dontCheck sup.stripe-http-client; + stripe-http-client = doJailbreak (dontCheck sup.stripe-http-client); temporary = dontCheck sup.temporary; wai-middleware-metrics = dontCheck sup.wai-middleware-metrics; }; diff --git a/Biz/Bild/Deps/Haskell.nix b/Biz/Bild/Deps/Haskell.nix index 39139af..7e9f4fe 100644 --- a/Biz/Bild/Deps/Haskell.nix +++ b/Biz/Bild/Deps/Haskell.nix @@ -20,7 +20,6 @@ with hpkgs; containers directory docopt - ekg envy fast-logger filepath @@ -33,12 +32,12 @@ with hpkgs; ixset katip lucid - miso monad-logger monad-metrics mtl neat-interpolation network-uri + niv optparse-simple parsec process diff --git a/Biz/Bild/Nixpkgs.nix b/Biz/Bild/Nixpkgs.nix index d29519c..480662a 100644 --- a/Biz/Bild/Nixpkgs.nix +++ b/Biz/Bild/Nixpkgs.nix @@ -6,6 +6,10 @@ import sources.nixpkgs { overlays = [ (_: _: { inherit sources; }) (_: pkgs: { + # Given a generic `builder`, will generate an attrset for all the packages + # pinned by `deps` with `builder` applied to the package. This attrset can + # then be merged with the rest of the packages in the set as part of an + # overlay or overrides. overridePinnedDeps = builder: pkgs.lib.genAttrs (builtins.attrNames pkgs.sources) builder; }) @@ -28,5 +32,8 @@ import sources.nixpkgs { config = { allowBroken = true; allowUnfree = true; + permittedInsecurePackages = [ + "python2.7-pyjwt-1.7.1" + ]; }; } diff --git a/Biz/Bild/Sources.json b/Biz/Bild/Sources.json index 7659958..b754685 100644 --- a/Biz/Bild/Sources.json +++ b/Biz/Bild/Sources.json @@ -1,17 +1,4 @@ { - "apply-refact": { - "branch": "master", - "description": "Refactor Haskell source files", - "homepage": "", - "owner": "mpickering", - "repo": "apply-refact", - "rev": "0.8.2.1", - "sha256": "0wyamn4w3lsayhsqs6h60f0m337b1p5byw1frmcyima3pqsgprvl", - "type": "tarball", - "url": "https://github.com/mpickering/apply-refact/archive/0.8.2.1.tar.gz", - "url_template": "https://github.com///archive/.tar.gz", - "version": "0.8.2.1" - }, "clay": { "branch": "master", "description": "A CSS preprocessor as embedded Haskell.", @@ -96,36 +83,23 @@ "homepage": "", "owner": "ghcjs", "repo": "jsaddle", - "rev": "d569be43f92b9b8c01dc3ee4c41401ab406a2076", - "sha256": "1m1xxy4l9ii91k1k504qkxh9k1ybprm1m66mkb9dqlwcpyhcccmv", + "rev": "00b206288c2cd019b56ff9f0b72a065f67ffb242", + "sha256": "179q0j4wmn28h1ny2p8qgpr25krl4v6dn3xmbn8zkvylkz4f3m42", "type": "tarball", - "url": "https://github.com/ghcjs/jsaddle/archive/d569be43f92b9b8c01dc3ee4c41401ab406a2076.tar.gz", + "url": "https://github.com/ghcjs/jsaddle/archive/00b206288c2cd019b56ff9f0b72a065f67ffb242.tar.gz", "url_template": "https://github.com///archive/.tar.gz", "version": "1e39844" }, - "miso": { - "branch": "master", - "description": ":ramen: A tasty Haskell front-end framework", - "homepage": "https://haskell-miso.org", - "owner": "dmjio", - "repo": "miso", - "rev": "41234e419d6177fe05913a1bd885f811afe5cc9f", - "sha256": "1nby1y8yixv0a47h1bzdfjcwzah3km7bfd0phdb520ci4dgs30w1", - "type": "tarball", - "url": "https://github.com/dmjio/miso/archive/41234e419d6177fe05913a1bd885f811afe5cc9f.tar.gz", - "url_template": "https://github.com///archive/.tar.gz", - "version": "1.5" - }, "niv": { "branch": "master", "description": "Easy dependency management for Nix projects", "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "af958e8057f345ee1aca714c1247ef3ba1c15f5e", - "sha256": "1qjavxabbrsh73yck5dcq8jggvh3r2jkbr6b5nlz5d9yrqm9255n", + "rev": "82e5cd1ad3c387863f0545d7591512e76ab0fc41", + "sha256": "090l219mzc0gi33i3psgph6s2pwsc8qy4lyrqjdj4qzkvmaj65a7", "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/af958e8057f345ee1aca714c1247ef3ba1c15f5e.tar.gz", + "url": "https://github.com/nmattia/niv/archive/82e5cd1ad3c387863f0545d7591512e76ab0fc41.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixos-mailserver": { @@ -144,10 +118,10 @@ "name": "nixpkgs", "owner": "bsima", "repo": "nixpkgs", - "rev": "11452e4fe3b4afe566b47f1f85c2cec863a4f5bb", - "sha256": "0csm6wxf1s6vx9kl0yl28lgiwnxans0023ib47qlrjbkmpaqy4b8", + "rev": "30216881bc4c0faf52f048b9141afe167762b917", + "sha256": "11qwps5mg8pgy5hvb2cw5l0vj7igk5gi7gskn9z6mqf7rv29yh4x", "type": "tarball", - "url": "https://github.com/bsima/nixpkgs/archive/11452e4fe3b4afe566b47f1f85c2cec863a4f5bb.tar.gz", + "url": "https://github.com/bsima/nixpkgs/archive/30216881bc4c0faf52f048b9141afe167762b917.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "regex-applicative": { @@ -164,29 +138,16 @@ "url_template": "https://github.com///archive/.tar.gz", "version": "0.3.4" }, - "req": { - "branch": "master", - "description": "Easy-to-use, type-safe, expandable, high-level HTTP client library", - "homepage": "", - "owner": "mrkkrp", - "repo": "req", - "rev": "0f799e9076053c4bdd685b81e0393d1682de8735", - "sha256": "1xrzplgas107zxnv23ai14r4s6wz57ycsav1zhikhk04zz442zhh", - "type": "tarball", - "url": "https://github.com/mrkkrp/req/archive/0f799e9076053c4bdd685b81e0393d1682de8735.tar.gz", - "url_template": "https://github.com///archive/.tar.gz", - "version": "3.8.0" - }, "servant-auth": { "branch": "master", "description": null, "homepage": null, "owner": "haskell-servant", - "repo": "servant-auth", - "rev": "servant-auth-0.4.0.0", - "sha256": "1wg67mr472mracyjd63ldlfiv85v2kdw2rvcvq1sahp05i591j26", + "repo": "servant", + "rev": "f0e2316895ee5fda52ba9d5b2b7e10f8a80a9019", + "sha256": "0ndan9zxvg5zvrl42zvppc9vhbn5skgsyqyxp2v685h82lfz74ps", "type": "tarball", - "url": "https://github.com/haskell-servant/servant-auth/archive/servant-auth-0.4.0.0.tar.gz", + "url": "https://github.com/haskell-servant/servant/archive/f0e2316895ee5fda52ba9d5b2b7e10f8a80a9019.tar.gz", "url_template": "https://github.com///archive/.tar.gz", "version": "0.4.0.0" } -- cgit v1.2.3