diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index 0889f7e1d9ed..e049064c7564 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -99,6 +99,11 @@ sed -r \ -e '/ Agda /d' \ -e '/ stack /d' \ -e '/ git-annex /d' \ + -e '/ hledger /d' \ + -e '/ hledger-iadd /d' \ + -e '/ hledger-lib /d' \ + -e '/ hledger-ui /d' \ + -e '/ hledger-web /d' \ < "${tmpfile_new}" >> $stackage_config # Explanations: # cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing. diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9a827595de1b..a57c0ed65723 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1603,10 +1603,6 @@ with haskellLib; # https://github.com/haskell-servant/servant-ekg/issues/15 servant-ekg = doJailbreak super.servant-ekg; - hledger_1_50_2 = super.hledger_1_50_2.override { - hledger-lib = self.hledger-lib_1_50_2; - }; - # it wants to build a statically linked binary by default hledger-flow = overrideCabal (drv: { postPatch = (drv.postPatch or "") + '' diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 3529a753ba40..f864277ab039 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1285,13 +1285,8 @@ default-package-overrides: - hjsmin ==0.2.1 - hkd-default ==1.1.0.0 - hkgr ==0.4.8 - - hledger ==1.43.2 - - hledger-iadd ==1.3.21 - hledger-interest ==1.6.7 - - hledger-lib ==1.43.2 - hledger-stockquotes ==0.1.3.2 - - hledger-ui ==1.43.2 - - hledger-web ==1.43.2 - hlibcpuid ==0.2.0 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.10.1 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9e7823811a4c..70e5142aa314 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -330610,192 +330610,6 @@ self: { ) { }; hledger = callPackage ( - { - mkDerivation, - aeson, - ansi-terminal, - base, - bytestring, - cmdargs, - containers, - data-default, - Decimal, - Diff, - directory, - extra, - filepath, - githash, - hashable, - haskeline, - hledger-lib, - http-client, - http-types, - lucid, - math-functions, - megaparsec, - microlens, - modern-uri, - mtl, - process, - regex-tdfa, - req, - safe, - shakespeare, - split, - tabular, - tasty, - temporary, - text, - text-ansi, - time, - timeit, - transformers, - unordered-containers, - utf8-string, - utility-ht, - wizards, - }: - mkDerivation { - pname = "hledger"; - version = "1.43.2"; - sha256 = "043gw3amc29fbjxlzyc4m97bw5i5462352lmk61adlxcd12l47i1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - ansi-terminal - base - bytestring - cmdargs - containers - data-default - Decimal - Diff - directory - extra - filepath - githash - hashable - haskeline - hledger-lib - http-client - http-types - lucid - math-functions - megaparsec - microlens - modern-uri - mtl - process - regex-tdfa - req - safe - shakespeare - split - tabular - tasty - temporary - text - text-ansi - time - timeit - transformers - unordered-containers - utf8-string - utility-ht - wizards - ]; - executableHaskellDepends = [ - aeson - ansi-terminal - base - bytestring - cmdargs - containers - data-default - Decimal - directory - extra - filepath - githash - haskeline - hledger-lib - http-client - http-types - math-functions - megaparsec - microlens - mtl - process - regex-tdfa - req - safe - shakespeare - split - tabular - tasty - temporary - text - text-ansi - time - timeit - transformers - unordered-containers - utf8-string - utility-ht - wizards - ]; - testHaskellDepends = [ - aeson - ansi-terminal - base - bytestring - cmdargs - containers - data-default - Decimal - directory - extra - filepath - githash - haskeline - hledger-lib - http-client - http-types - math-functions - megaparsec - microlens - mtl - process - regex-tdfa - req - safe - shakespeare - split - tabular - tasty - temporary - text - text-ansi - time - timeit - transformers - unordered-containers - utf8-string - utility-ht - wizards - ]; - description = "Command-line interface for the hledger accounting system"; - license = lib.licenses.gpl3Plus; - mainProgram = "hledger"; - maintainers = [ - lib.maintainers.maralorn - lib.maintainers.sternenseemann - ]; - } - ) { }; - - hledger_1_50_2 = callPackage ( { mkDerivation, aeson, @@ -330973,7 +330787,6 @@ self: { ]; description = "Command-line interface for the hledger accounting system"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; mainProgram = "hledger"; maintainers = [ lib.maintainers.maralorn @@ -331177,103 +330990,6 @@ self: { ) { }; hledger-iadd = callPackage ( - { - mkDerivation, - base, - brick, - containers, - directory, - free, - hledger-lib, - hspec, - hspec-discover, - megaparsec, - microlens, - microlens-mtl, - microlens-th, - optparse-applicative, - QuickCheck, - quickcheck-instances, - text, - text-zipper, - time, - transformers, - unordered-containers, - vector, - vty, - xdg-basedir, - }: - mkDerivation { - pname = "hledger-iadd"; - version = "1.3.21"; - sha256 = "00x0vbfp08kqs1nbknndk9h56hcidf6xnrk0ldz45dvjrmgcv3w2"; - revision = "11"; - editedCabalFile = "16v21gwa4zkwjmg5ys4zchajv5k0dbk22vvr9hwfdwb7g21h3dvf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - brick - containers - directory - free - hledger-lib - megaparsec - microlens - microlens-mtl - microlens-th - optparse-applicative - text - text-zipper - time - transformers - unordered-containers - vector - vty - xdg-basedir - ]; - executableHaskellDepends = [ - base - brick - directory - free - hledger-lib - megaparsec - microlens - microlens-mtl - microlens-th - optparse-applicative - text - text-zipper - time - transformers - unordered-containers - vector - vty - xdg-basedir - ]; - testHaskellDepends = [ - base - free - hledger-lib - hspec - megaparsec - QuickCheck - quickcheck-instances - text - text-zipper - time - transformers - vector - ]; - testToolDepends = [ hspec-discover ]; - description = "A terminal UI as drop-in replacement for hledger add"; - license = lib.licenses.bsd3; - mainProgram = "hledger-iadd"; - } - ) { }; - - hledger-iadd_1_3_22 = callPackage ( { mkDerivation, base, @@ -331366,7 +331082,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A terminal UI as drop-in replacement for hledger add"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hledger-iadd"; } ) { }; @@ -331443,166 +331158,6 @@ self: { ) { }; hledger-lib = callPackage ( - { - mkDerivation, - aeson, - aeson-pretty, - ansi-terminal, - array, - base, - blaze-html, - blaze-markup, - bytestring, - call-stack, - cassava, - cassava-megaparsec, - cmdargs, - colour, - containers, - data-default, - Decimal, - deepseq, - directory, - doclayout, - doctest, - encoding, - extra, - file-embed, - filepath, - Glob, - hashtables, - lucid, - megaparsec, - microlens, - microlens-th, - mtl, - parser-combinators, - pretty-simple, - process, - regex-tdfa, - safe, - tabular, - tasty, - tasty-hunit, - template-haskell, - terminal-size, - text, - time, - timeit, - transformers, - uglymemo, - unordered-containers, - utf8-string, - }: - mkDerivation { - pname = "hledger-lib"; - version = "1.43.2"; - sha256 = "18037qwz7d0h4i86ac0w3hkrvx22vdxf04fjbg0qjlizgb3dlazf"; - libraryHaskellDepends = [ - aeson - aeson-pretty - ansi-terminal - array - base - blaze-html - blaze-markup - bytestring - call-stack - cassava - cassava-megaparsec - cmdargs - colour - containers - data-default - Decimal - deepseq - directory - doclayout - encoding - extra - file-embed - filepath - Glob - hashtables - lucid - megaparsec - microlens - microlens-th - mtl - parser-combinators - pretty-simple - process - regex-tdfa - safe - tabular - tasty - tasty-hunit - template-haskell - terminal-size - text - time - timeit - transformers - uglymemo - unordered-containers - utf8-string - ]; - testHaskellDepends = [ - aeson - aeson-pretty - ansi-terminal - array - base - blaze-html - blaze-markup - bytestring - call-stack - cassava - cassava-megaparsec - cmdargs - colour - containers - data-default - Decimal - deepseq - directory - doclayout - doctest - encoding - extra - file-embed - filepath - Glob - hashtables - lucid - megaparsec - microlens - microlens-th - mtl - parser-combinators - pretty-simple - process - regex-tdfa - safe - tabular - tasty - tasty-hunit - template-haskell - terminal-size - text - time - timeit - transformers - uglymemo - unordered-containers - utf8-string - ]; - description = "A library providing the core functionality of hledger"; - license = lib.licenses.gpl3Plus; - } - ) { }; - - hledger-lib_1_50_2 = callPackage ( { mkDerivation, aeson, @@ -331762,7 +331317,6 @@ self: { ]; description = "A library providing the core functionality of hledger"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -331889,86 +331443,6 @@ self: { ) { }; hledger-ui = callPackage ( - { - mkDerivation, - ansi-terminal, - async, - base, - brick, - cmdargs, - containers, - data-default, - directory, - doclayout, - extra, - filepath, - fsnotify, - githash, - hledger, - hledger-lib, - megaparsec, - microlens, - microlens-platform, - mtl, - process, - safe, - split, - text, - text-zipper, - time, - transformers, - unix, - vector, - vty, - vty-crossplatform, - }: - mkDerivation { - pname = "hledger-ui"; - version = "1.43.2"; - sha256 = "1xz5ndkg5mci689n82dnmwhhr8a08qw12czsf4b82ha7zlmbkmnv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal - async - base - brick - cmdargs - containers - data-default - directory - doclayout - extra - filepath - fsnotify - githash - hledger - hledger-lib - megaparsec - microlens - microlens-platform - mtl - process - safe - split - text - text-zipper - time - transformers - unix - vector - vty - vty-crossplatform - ]; - executableHaskellDepends = [ base ]; - description = "Terminal interface for the hledger accounting system"; - license = lib.licenses.gpl3Plus; - mainProgram = "hledger-ui"; - maintainers = [ lib.maintainers.maralorn ]; - } - ) { }; - - hledger-ui_1_50_2 = callPackage ( { mkDerivation, ansi-terminal, @@ -332047,7 +331521,6 @@ self: { executableHaskellDepends = [ base ]; description = "Terminal interface for the hledger accounting system"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; mainProgram = "hledger-ui"; maintainers = [ lib.maintainers.maralorn ]; } @@ -332090,125 +331563,6 @@ self: { ) { }; hledger-web = callPackage ( - { - mkDerivation, - aeson, - base, - base64, - blaze-html, - blaze-markup, - bytestring, - case-insensitive, - clientsession, - cmdargs, - conduit, - conduit-extra, - containers, - data-default, - Decimal, - directory, - extra, - file-embed, - filepath, - githash, - hjsmin, - hledger, - hledger-lib, - hspec, - http-client, - http-conduit, - http-types, - megaparsec, - mtl, - network, - safe, - shakespeare, - template-haskell, - text, - time, - transformers, - unix-compat, - unordered-containers, - utf8-string, - wai, - wai-cors, - wai-extra, - wai-handler-launch, - warp, - yaml, - yesod, - yesod-core, - yesod-form, - yesod-static, - yesod-test, - }: - mkDerivation { - pname = "hledger-web"; - version = "1.43.2"; - sha256 = "0d4sv9k3m7s0764lbq2l8w9p2p47cby177l0avl5w3fa9y8d0gyd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - base - base64 - blaze-html - blaze-markup - bytestring - case-insensitive - clientsession - cmdargs - conduit - conduit-extra - containers - data-default - Decimal - directory - extra - file-embed - filepath - githash - hjsmin - hledger - hledger-lib - hspec - http-client - http-conduit - http-types - megaparsec - mtl - network - safe - shakespeare - template-haskell - text - time - transformers - unix-compat - unordered-containers - utf8-string - wai - wai-cors - wai-extra - wai-handler-launch - warp - yaml - yesod - yesod-core - yesod-form - yesod-static - yesod-test - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; - description = "Web user interface for the hledger accounting system"; - license = lib.licenses.gpl3Plus; - mainProgram = "hledger-web"; - maintainers = [ lib.maintainers.maralorn ]; - } - ) { }; - - hledger-web_1_50_2 = callPackage ( { mkDerivation, aeson, @@ -332322,7 +331676,6 @@ self: { testHaskellDepends = [ base ]; description = "Web user interface for the hledger accounting system"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; mainProgram = "hledger-web"; maintainers = [ lib.maintainers.maralorn ]; }