Add unicode-data-names dependency

This commit is contained in:
Paul Brinkmeier 2023-03-01 03:41:39 +01:00
parent c09ae680ba
commit b462796dbd
7 changed files with 16 additions and 12 deletions

7
hie.yaml Normal file
View File

@ -0,0 +1,7 @@
cradle:
stack:
- path: "./test/Spec.hs"
component: "utoy:test:utoy-test"
- path: "./app/Main.hs"
component: "utoy:exe:utoy-exe"

View File

@ -14,7 +14,7 @@ let
};
haskellOverlay = pkgs: final: prev: {
unicode-data = prev.unicode-data_0_4_0_1;
unicode-data = prev.unicode-data_0_4_0;
unicode-data-names = pkgs.haskell.lib.markUnbroken prev.unicode-data-names;
};
in

View File

@ -12,15 +12,15 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs": {
"branch": "nixpkgs-unstable",
"branch": "nixos-22.11",
"description": "Nix Packages collection",
"homepage": "",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9952d6bc395f5841262b006fbace8dd7e143b634",
"sha256": "0kvpf63dda6nzbqd2kyr99qh1av89mva26xykp3zb4diyicp7yji",
"rev": "7076110064c09f0b3942f609f2134c1358ef2e50",
"sha256": "0j7idx8vyb0spwxqb7rr8pk15wi7yfyf5hp608wkhaz7wjw8k9nf",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/9952d6bc395f5841262b006fbace8dd7e143b634.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/7076110064c09f0b3942f609f2134c1358ef2e50.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}

View File

@ -13,7 +13,6 @@ extra-source-files:
dependencies:
- base >= 4.7 && < 5
- unicode-data-names
ghc-options:
- -Wall

View File

@ -2,6 +2,7 @@
let
haskellDeps = import ./nix/haskell-deps.nix;
settings = import ./nix/settings.nix;
haskellPackages = pkgs.haskell.packages."${settings.ghc}";
tools = with pkgs; [
# nix tools
@ -10,8 +11,8 @@ let
# haskell tools
stack
haskell-language-server
(pkgs.haskell.packages."${settings.ghc}".ghcWithPackages haskellDeps)
pkgs.haskell.packages."${settings.ghc}".haskell-language-server
];
in
pkgs.mkShellNoCC {

View File

@ -1,8 +1,8 @@
{}:
let
pkgs = import ./nix/pkgs.nix {};
settings = import ./nix/settings.nix;
haskellDeps = import ./nix/haskell-deps.nix;
settings = import ./nix/settings.nix;
in
pkgs.haskell.lib.buildStackProject {
name = "utoy";

View File

@ -1,6 +1,6 @@
cabal-version: 1.12
-- This file has been generated from package.yaml by hpack version 0.35.2.
-- This file has been generated from package.yaml by hpack version 0.35.0.
--
-- see: https://github.com/sol/hpack
@ -27,7 +27,6 @@ library
ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints
build-depends:
base >=4.7 && <5
, unicode-data-names
default-language: Haskell2010
executable utoy-exe
@ -37,7 +36,6 @@ executable utoy-exe
ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
build-depends:
base >=4.7 && <5
, unicode-data-names
, utoy
default-language: Haskell2010
@ -51,6 +49,5 @@ test-suite utoy-test
ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
build-depends:
base >=4.7 && <5
, unicode-data-names
, utoy
default-language: Haskell2010