From 3c1cb894296e6847773d5878c6d06cfde846885b Mon Sep 17 00:00:00 2001 From: maralorn Date: Thu, 19 Jan 2023 04:20:46 +0100 Subject: [PATCH] Fix logfeed build --- packages/logfeed/logfeed.cabal | 20 ++++++++------------ packages/logfeed/shell.nix | 11 ----------- 2 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 packages/logfeed/shell.nix diff --git a/packages/logfeed/logfeed.cabal b/packages/logfeed/logfeed.cabal index 76e1061f..dc9e56ca 100644 --- a/packages/logfeed/logfeed.cabal +++ b/packages/logfeed/logfeed.cabal @@ -1,17 +1,13 @@ -cabal-version: >=1.10 +cabal-version: >=1.10 -- Initial package description 'logfeed.cabal' generated by 'cabal init'. -- For further documentation, see http://haskell.org/cabal/users-guide/ -name: logfeed -version: 0.1.0.0 -author: maralorn -maintainer: mail@maralorn.de - --- copyright: --- category: -build-type: Simple -extra-source-files: CHANGELOG.md +name: logfeed +version: 0.1.0.0 +author: maralorn +maintainer: mail@maralorn.de +build-type: Simple executable log2rss main-is: Main.hs @@ -32,7 +28,7 @@ executable log2rss , text , time - default-language: Haskell2010 + default-language: GHC2021 executable mail2rss default-extensions: ImportQualifiedPost @@ -58,4 +54,4 @@ executable mail2rss , text , time - default-language: Haskell2010 + default-language: GHC2021 diff --git a/packages/logfeed/shell.nix b/packages/logfeed/shell.nix deleted file mode 100644 index 40d56aa3..00000000 --- a/packages/logfeed/shell.nix +++ /dev/null @@ -1,11 +0,0 @@ -{pkgs ? import (import ../../nix/sources.nix).nixos-unstable {}}: let - inherit (pkgs) haskellPackages; -in - haskellPackages.shellFor { - withHoogle = true; - packages = p: [(import ./. {inherit pkgs;})]; - buildInputs = builtins.attrValues { - inherit (haskellPackages) hlint cabal-install notmuch hsemail; - inherit (pkgs) coreutils zlib; - }; - }