Skip to content

Commit

Permalink
Merge #118: Update nixpkgs pin
Browse files Browse the repository at this point in the history 
Approved-by: crtschin
Auto-deploy: false
  • Loading branch information
@OpsBotPrime
OpsBotPrime committed Dec 5, 2023
2 parents 4173a02 + b501a8a commit 521d1c9
Show file tree
Hide file tree
Showing 8 changed files with 245 additions and 212 deletions.
161 changes: 80 additions & 81 deletions cabal.project.freeze
View file
Original file line number Diff line number Diff line change
@@ -1,55 +1,56 @@
active-repositories: hackage.haskell.org:merge
constraints: any.HUnit ==1.6.2.0,
any.OneTuple ==0.3.1,
any.OneTuple ==0.4.1.1,
any.Only ==0.1,
any.QuickCheck ==2.14.2,
any.QuickCheck ==2.14.3,
any.SHA ==1.6.4.4,
any.StateVar ==1.2.2,
any.aeson ==2.0.3.0,
any.ansi-terminal ==0.11.4,
any.aeson ==2.1.2.1,
any.ansi-terminal ==0.11.5,
any.ansi-terminal-types ==0.11.5,
any.ansi-wl-pprint ==0.6.9,
any.appar ==0.1.8,
any.array ==0.5.4.0,
any.asn1-encoding ==0.9.6,
any.asn1-parse ==0.9.5,
any.asn1-types ==0.3.4,
any.assoc ==1.0.2,
any.assoc ==1.1,
any.async ==2.2.4,
any.atomic-primops ==0.8.4,
any.attoparsec ==0.14.4,
any.auto-update ==0.1.6,
any.base ==4.16.4.0,
any.base-compat ==0.12.2,
any.base-compat-batteries ==0.12.2,
any.base-orphans ==0.8.7,
any.base ==4.17.2.0,
any.base-compat ==0.12.3,
any.base-compat-batteries ==0.12.3,
any.base-orphans ==0.9.1,
any.base64-bytestring ==1.2.1.0,
any.basement ==0.0.15,
any.bifunctors ==5.5.14,
any.binary ==0.8.9.0,
any.blaze-builder ==0.4.2.2,
any.blaze-textual ==0.2.2.1,
any.basement ==0.0.16,
any.bifunctors ==5.5.15,
any.binary ==0.8.9.1,
any.bitvec ==1.1.5.0,
any.blaze-builder ==0.4.2.3,
any.blaze-textual ==0.2.3.1,
any.bsb-http-chunked ==0.0.0.4,
any.byteable ==0.1.1,
any.byteorder ==1.0.4,
any.bytestring ==0.11.4.0,
any.bytestring ==0.11.5.2,
any.bytestring-builder ==0.10.8.2.0,
any.call-stack ==0.4.0,
any.case-insensitive ==1.2.1.0,
any.cereal ==0.5.8.3,
any.clock ==0.8.3,
any.clock ==0.8.4,
any.colour ==2.3.6,
any.comonad ==5.0.8,
any.conduit ==1.3.4.3,
any.conduit ==1.3.5,
any.conduit-extra ==1.3.6,
any.connection ==0.3.1,
any.containers ==0.6.5.1,
any.containers ==0.6.7,
any.contravariant ==1.5.5,
any.cookie ==0.4.6,
any.cryptohash-md5 ==0.11.101.0,
any.cryptohash-sha1 ==0.11.101.0,
any.cryptonite ==0.30,
any.cryptostore ==0.2.3.0,
any.data-array-byte ==0.1.0.1,
any.cryptostore ==0.3.0.1,
any.data-default ==0.7.1.1,
any.data-default-class ==0.1.2.0,
any.data-default-instances-containers ==0.0.1,
Expand All @@ -58,132 +59,130 @@ constraints: any.HUnit ==1.6.2.0,
any.data-fix ==0.3.2,
any.data-sketches ==0.3.1.0,
any.data-sketches-core ==0.1.0.0,
any.deepseq ==1.4.6.1,
any.deepseq ==1.4.8.0,
any.direct-sqlite ==2.3.28,
any.directory ==1.3.6.2,
any.directory ==1.3.7.1,
any.distributive ==0.6.2.1,
any.dlist ==1.0,
any.easy-file ==0.2.2,
any.easy-file ==0.2.5,
any.entropy ==0.4.1.10,
any.exceptions ==0.10.4,
any.fast-logger ==3.1.2,
any.exceptions ==0.10.5,
any.fast-logger ==3.2.2,
any.filepath ==1.4.2.2,
any.ghc ==9.2.7,
any.ghc-bignum ==1.2,
any.ghc-boot ==9.2.7,
any.ghc-boot-th ==9.2.7,
any.ghc-heap ==9.2.7,
any.ghc-prim ==0.8.0,
any.ghci ==9.2.7,
any.hashable ==1.4.2.0,
any.foldable1-classes-compat ==0.1,
any.generically ==0.1.1,
any.ghc-bignum ==1.3,
any.ghc-boot-th ==9.4.7,
any.ghc-prim ==0.9.1,
any.hashable ==1.4.3.0,
any.haskell-lexer ==1.1.1,
any.hourglass ==0.2.12,
any.hpc ==0.6.1.0,
any.hspec ==2.9.7,
any.hspec-core ==2.9.7,
any.hspec-discover ==2.9.7,
any.hspec ==2.10.10,
any.hspec-core ==2.10.10,
any.hspec-discover ==2.10.10,
any.hspec-expectations ==0.8.2,
any.hspec-wai ==0.11.1,
any.http-client ==0.7.13.1,
any.http-client ==0.7.14,
any.http-client-tls ==0.3.6.1,
any.http-conduit ==2.3.8,
any.http-conduit ==2.3.8.1,
any.http-date ==0.0.11,
any.http-types ==0.12.3,
any.http2 ==3.0.3,
any.indexed-traversable ==0.1.2,
any.indexed-traversable-instances ==0.1.1.1,
any.http2 ==4.1.4,
any.indexed-traversable ==0.1.3,
any.indexed-traversable-instances ==0.1.1.2,
any.integer-gmp ==1.1,
any.integer-logarithms ==1.0.3.1,
any.iproute ==1.7.12,
any.jwt ==0.11.0,
any.lifted-base ==0.2.3.12,
any.math-functions ==0.3.4.2,
any.memory ==0.17.0,
any.mime-types ==0.1.0.9,
any.memory ==0.18.0,
any.mime-types ==0.1.1.0,
any.monad-control ==1.0.3.1,
any.monad-logger ==0.3.39,
any.monad-logger ==0.3.40,
any.monad-loops ==0.4.3,
any.mono-traversable ==1.0.15.3,
any.mtl ==2.2.2,
any.mtl-compat ==0.2.2,
any.mwc-random ==0.15.0.2,
any.network ==3.1.2.7,
any.network-byte-order ==0.1.6,
any.network ==3.1.4.0,
any.network-byte-order ==0.1.7,
any.network-info ==0.2.1,
any.network-uri ==2.6.4.2,
any.old-locale ==1.0.0.7,
any.old-time ==1.1.0.3,
any.optparse-applicative ==0.17.0.0,
any.parsec ==3.1.15.0,
any.optparse-applicative ==0.17.1.0,
any.parsec ==3.1.16.1,
any.pem ==0.2.4,
any.pretty ==1.1.3.6,
any.primitive ==0.7.3.0,
any.process ==1.6.16.0,
any.prometheus-client ==1.1.0,
any.primitive ==0.8.0.0,
any.process ==1.6.17.0,
any.prometheus-client ==1.1.1,
any.prometheus-metrics-ghc ==1.0.1.2,
any.psqueues ==0.2.7.3,
any.quickcheck-instances ==0.3.28,
any.quickcheck-instances ==0.3.30,
any.quickcheck-io ==0.2.0,
any.random ==1.2.1.1,
any.raven-haskell ==0.1.4.1,
any.recv ==0.0.0,
any.recv ==0.1.0,
any.regex-base ==0.94.0.2,
any.regex-compat ==0.95.2.1,
any.regex-posix ==0.96.0.1,
any.resourcet ==1.2.6,
any.retry ==0.9.3.0,
any.retry ==0.9.3.1,
any.rts ==1.0.2,
any.safe-exceptions ==0.1.7.3,
any.safe-exceptions ==0.1.7.4,
any.scientific ==0.3.7.0,
any.scotty ==0.12.1,
any.securemem ==0.1.10,
any.semialign ==1.2.0.1,
any.semialign ==1.3,
any.semigroupoids ==5.3.7,
any.semigroups ==0.20,
any.setenv ==0.1.1.3,
any.simple-sendfile ==0.2.30,
any.simple-sendfile ==0.2.32,
any.socks ==0.6.1,
any.split ==0.2.3.5,
any.splitmix ==0.1.0.4,
any.splitmix ==0.1.0.5,
any.sqlite-simple ==0.4.18.2,
any.stm ==2.5.0.2,
any.stm-chans ==3.0.0.6,
any.streaming-commons ==0.2.2.5,
any.strict ==0.4.0.1,
any.tagged ==0.8.6.1,
any.template-haskell ==2.18.0.0,
any.terminfo ==0.4.1.5,
any.text ==1.2.5.0,
any.stm ==2.5.1.0,
any.stm-chans ==3.0.0.9,
any.streaming-commons ==0.2.2.6,
any.strict ==0.5,
any.tagged ==0.8.7,
any.template-haskell ==2.19.0.0,
any.text ==2.0.2,
any.text-short ==0.1.5,
any.tf-random ==0.5,
any.th-abstraction ==0.4.5.0,
any.th-compat ==0.1.4,
any.these ==1.1.1.1,
any.time ==1.11.1.1,
any.these ==1.2,
any.time ==1.12.2,
any.time-compat ==1.9.6.1,
any.time-manager ==0.0.0,
any.tls ==1.5.8,
any.time-manager ==0.0.1,
any.tls ==1.6.0,
any.transformers ==0.5.6.2,
any.transformers-base ==0.4.6,
any.transformers-compat ==0.7.2,
any.typed-process ==0.2.10.1,
any.unix ==2.7.2.2,
any.unix-compat ==0.5.4,
any.unix-time ==0.4.8,
any.unliftio ==0.2.23.0,
any.typed-process ==0.2.11.1,
any.unix ==2.7.3,
any.unix-compat ==0.7,
any.unix-time ==0.4.11,
any.unliftio ==0.2.25.0,
any.unliftio-core ==0.2.1.0,
any.unordered-containers ==0.2.19.1,
any.utf8-string ==1.0.2,
any.uuid ==1.3.15,
any.uuid-types ==1.0.5,
any.uuid-types ==1.0.5.1,
any.vault ==0.3.1.5,
any.vector ==0.12.3.1,
any.vector-algorithms ==0.8.0.4,
any.vector ==0.13.1.0,
any.vector-algorithms ==0.9.0.1,
any.vector-stream ==0.1.0.0,
any.wai ==3.2.3,
any.wai-extra ==3.1.13.0,
any.wai-logger ==2.4.0,
any.wai-middleware-prometheus ==1.0.0.1,
any.wai-websockets ==3.0.1.2,
any.warp ==3.3.23,
any.warp ==3.3.25,
any.websockets ==0.12.7.3,
any.witherable ==0.4.2,
any.word8 ==0.1.3,
Expand All @@ -192,4 +191,4 @@ constraints: any.HUnit ==1.6.2.0,
any.x509-system ==1.6.7,
any.x509-validation ==1.6.12,
any.zlib ==0.6.3.0
index-state: HEAD
index-state: hackage.haskell.org 2023-11-17T10:05:58Z
18 changes: 9 additions & 9 deletions client-haskell/icepeak-client.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ library
-Wall -Wincomplete-uni-patterns -Wincomplete-record-updates

build-depends:
aeson
, base
, binary
, bytestring
, exceptions
, http-client
, http-types
, retry
, text
aeson >=2.1.2 && <2.2
, base >=4.17.2 && <4.18
, binary >=0.8.9 && <0.9
, bytestring >=0.11.5 && <0.12
, exceptions >=0.10.5 && <0.11
, http-client >=0.7.14 && <0.8
, http-types >=0.12.3 && <0.13
, retry >=0.9.3 && <0.10
, text >=2.0.2 && <2.1

default-language: Haskell2010
2 changes: 2 additions & 0 deletions default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ let
(pkgs.python310.withPackages (p: [ p.websockets p.requests ]))

pkgs.haskellPackages.cabal-install
pkgs.haskellPackages.cabal-fmt
pkgs.haskellPackages.channalu
pkgs.haskellPackages.haskell-language-server
pkgs.haskellPackages.implicit-hie
];
Expand Down
23 changes: 23 additions & 0 deletions nix/haskell-overlay.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,27 @@
self: super: {
icepeak = self.callPackage ../server/icepeak.nix { };
icepeak-client = self.callPackage ../client-haskell/icepeak-client.nix { };
channalu =
let
fourmolu_args = [
"--indentation=2"
"--function-arrows=leading"
"--comma-style=leading"
"--import-export-style=diff-friendly"
"--indent-wheres=false"
"--record-brace-space=false"
"--newlines-between-decls=1"
"--haddock-style=single-line"
"--haddock-style-module=single-line"
"--let-style=mixed"
"--in-style=left-align"
"--unicode=never"
"--respectful=true"
];
# The executable is still called `fourmolu`, because this enables integration with HLS. HLS
# recognises only a hardcoded set of pretty printers, because they have different CLIs. By
# pretending that channalu is fourmolu, we reap the benefit of HLS knowing how to call it.
in pkgs.writeShellScriptBin "fourmolu" ''
exec ${self.fourmolu}/bin/fourmolu ${pkgs.lib.concatStringsSep " " fourmolu_args} "$@"
'';
}
6 changes: 3 additions & 3 deletions nix/sources.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"homepage": "",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c9ece0059f42e0ab53ac870104ca4049df41b133",
"sha256": "1qrb99vbwb3xdc0860z7izy0x7p1mbnyg5lrwsr3yn5i73zcwcf4",
"rev": "7414e9ee0b3e9903c24d3379f577a417f0aae5f1",
"sha256": "1lcyq7pd58mpkpyzg09vmr6l7x0vrxih29gj1yklz3r4bxpb5fpq",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/c9ece0059f42e0ab53ac870104ca4049df41b133.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/7414e9ee0b3e9903c24d3379f577a417f0aae5f1.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}
Loading

0 comments on commit 521d1c9

Please sign in to comment.