From d769c58ee8c008d29caa0dcfd45373ad64e00264 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 19 Oct 2021 00:26:00 +0200 Subject: [PATCH] haskellPackages.taskwarrior: Pin version for aeson compat --- .../configuration-hackage2nix/main.yaml | 2 ++ .../haskell-modules/hackage-packages.nix | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index e6a1c1e1be21..d5a7fad75334 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -100,6 +100,8 @@ default-package-overrides: - hiedb == 0.4.0.* # 2021-10-13: weeder 2.3.0 require GHC == 9.0.*; remove pin when GHC version changes - weeder < 2.3.0 + # 2021-10-10: taskwarrior 0.4 requires aeson > 2.0.1.0 + - taskwarrior < 0.4.0.0 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 617e45f6fc52..9f6bbb341955 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -263009,6 +263009,31 @@ self: { }) {}; "taskwarrior" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , hspec-discover, process, QuickCheck, quickcheck-instances, random + , text, time, unordered-containers, uuid + }: + mkDerivation { + pname = "taskwarrior"; + version = "0.3.0.0"; + sha256 = "1h24d799q1s6b36hd40bxa4c9m1izkgh6j7p2jv1p6cxngz28ni0"; + revision = "6"; + editedCabalFile = "02jag4yib1fqf2fp9p323hb3vsbkrqm1k9zp2wag6ysl5kvvq1x6"; + libraryHaskellDepends = [ + aeson base bytestring containers process random text time + unordered-containers uuid + ]; + testHaskellDepends = [ + aeson base hspec QuickCheck quickcheck-instances text time + unordered-containers uuid + ]; + testToolDepends = [ hspec-discover ]; + description = "Types and aeson instances for taskwarrior tasks"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + + "taskwarrior_0_4_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec , hspec-discover, process, QuickCheck, quickcheck-instances, random , text, time, uuid @@ -263027,6 +263052,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Types and aeson instances for taskwarrior tasks"; license = lib.licenses.agpl3Plus; + hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ maralorn ]; }) {};