diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 8a0cda37add8..7daf09ffe0dd 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -3,7 +3,6 @@ mkDerivation, aeson, ansi-terminal, - ansi-wl-pprint, base, bytestring, Cabal, @@ -24,6 +23,7 @@ mtl, optparse-applicative, pretty, + prettyprinter, process, split, tasty, @@ -35,10 +35,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2025-04-30"; + version = "unstable-2025-06-14"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/fbe593fe71b916861b97117dfb91f7aae9c4fcce.tar.gz"; - sha256 = "0sdyyawsz5zl2ffg4h4r3xcf73gfz9v0vgahccbp01if3m2g7p0y"; + url = "https://github.com/NixOS/cabal2nix/archive/e9e2ebd9ab5c89c6cd55dd2c568dd46086f2addb.tar.gz"; + sha256 = "0in0vab4vihamdhf0zs8y22dwm7h4fqzryq47cxb48cxg29rfz9y"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; @@ -46,7 +46,6 @@ mkDerivation { libraryHaskellDepends = [ aeson ansi-terminal - ansi-wl-pprint base bytestring Cabal @@ -62,6 +61,7 @@ mkDerivation { lens optparse-applicative pretty + prettyprinter process split text diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 5acdf7a5a59c..a7d4dc95eb40 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -277,7 +277,6 @@ dont-distribute-packages: - bitcoin-api-extra - bitcoin-block - bitcoin-tx - - bitcoin-types - bitcoind-regtest - Bitly - bitly-cli @@ -2205,7 +2204,6 @@ dont-distribute-packages: - MFlow - Mhailist - Michelangelo - - micro-gateway - microformats2-types - MicroHs - MicrosoftTranslator @@ -3148,7 +3146,6 @@ dont-distribute-packages: - sibe - sigma-ij - signals - - signature - signify-hs - silvi - simgi diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d120c57abc77..3cb628deecde 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -108139,7 +108139,6 @@ self: { ]; description = "Provides consistent low-level types used commonly among Bitcoin implementations"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -421047,142 +421046,125 @@ self: { } ) { }; - "liquid-fixpoint" = - callPackage - ( - { - mkDerivation, - aeson, - ansi-terminal, - array, - ascii-progress, - async, - attoparsec, - base, - binary, - boxes, - bytestring, - cereal, - cmdargs, - containers, - deepseq, - directory, - fgl, - filepath, - git, - hashable, - intern, - lens-family, - megaparsec, - mtl, - nettools, - optparse-applicative, - parallel, - parser-combinators, - pretty, - process, - rest-rewrite, - smtlib-backends, - smtlib-backends-process, - stm, - store, - syb, - tagged, - tasty, - tasty-ant-xml, - tasty-hunit, - tasty-quickcheck, - tasty-rerun, - text, - transformers, - unordered-containers, - vector, - z3, - }: - mkDerivation { - pname = "liquid-fixpoint"; - version = "0.9.6.3.3"; - sha256 = "07dpgi5iwi1kf182vpcy5h3xq3bjxsvp16ayafbr0wv8wxg6l5ib"; - configureFlags = [ "-fbuild-external" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson - ansi-terminal - array - ascii-progress - async - attoparsec - base - binary - boxes - bytestring - cereal - cmdargs - containers - deepseq - directory - fgl - filepath - hashable - intern - lens-family - megaparsec - mtl - parallel - parser-combinators - pretty - process - rest-rewrite - smtlib-backends - smtlib-backends-process - stm - store - syb - text - transformers - unordered-containers - vector - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base - containers - directory - filepath - hashable - mtl - optparse-applicative - process - stm - tagged - tasty - tasty-ant-xml - tasty-hunit - tasty-quickcheck - tasty-rerun - text - transformers - unordered-containers - ]; - testSystemDepends = [ - git - nettools - z3 - ]; - doCheck = false; - description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "fixpoint"; - broken = true; - } - ) - { - inherit (pkgs) git; - inherit (pkgs) nettools; - inherit (pkgs) z3; - }; + "liquid-fixpoint" = callPackage ( + { + mkDerivation, + aeson, + ansi-terminal, + array, + ascii-progress, + async, + attoparsec, + base, + binary, + boxes, + bytestring, + cereal, + cmdargs, + containers, + deepseq, + directory, + fgl, + filepath, + hashable, + intern, + lens-family, + megaparsec, + mtl, + optparse-applicative, + parallel, + parser-combinators, + pretty, + process, + rest-rewrite, + smtlib-backends, + smtlib-backends-process, + stm, + store, + syb, + tagged, + tasty, + tasty-ant-xml, + tasty-hunit, + tasty-quickcheck, + tasty-rerun, + text, + transformers, + unordered-containers, + vector, + }: + mkDerivation { + pname = "liquid-fixpoint"; + version = "0.9.6.3.3"; + sha256 = "07dpgi5iwi1kf182vpcy5h3xq3bjxsvp16ayafbr0wv8wxg6l5ib"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson + ansi-terminal + array + ascii-progress + async + attoparsec + base + binary + boxes + bytestring + cereal + cmdargs + containers + deepseq + directory + fgl + filepath + hashable + intern + lens-family + megaparsec + mtl + parallel + parser-combinators + pretty + process + rest-rewrite + smtlib-backends + smtlib-backends-process + stm + store + syb + text + transformers + unordered-containers + vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base + containers + directory + filepath + hashable + mtl + optparse-applicative + process + stm + tagged + tasty + tasty-ant-xml + tasty-hunit + tasty-quickcheck + tasty-rerun + text + transformers + unordered-containers + ]; + description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "fixpoint"; + broken = true; + } + ) { }; "liquid-ghc-prim" = callPackage ( { @@ -444396,7 +444378,6 @@ self: { ]; description = "A Micro service gateway"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "simple-gateway"; } ) { }; @@ -607251,7 +607232,6 @@ self: { ]; description = "Hmac sha256 signature json and http payload"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; } ) { };