mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
haskellPackages.gi-soup: 3.0.2 -> 2.4.28
Use an older version of gi-soup to remain compatible with the prevailing libsoup version in the other gi- packages
This commit is contained in:
parent
982eab30da
commit
5fd7c9645e
3 changed files with 29 additions and 1 deletions
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (pkgs) fetchpatch fetchpatch2 lib;
|
inherit (pkgs) fetchpatch fetchpatch2 lib;
|
||||||
inherit (lib) throwIfNot versionOlder;
|
inherit (lib) throwIfNot versionOlder versions;
|
||||||
in
|
in
|
||||||
|
|
||||||
with haskellLib;
|
with haskellLib;
|
||||||
|
@ -2607,4 +2607,9 @@ self: super: {
|
||||||
# 2023-03-13: restrictive bounds on validation-selective (>=0.1.0 && <0.2).
|
# 2023-03-13: restrictive bounds on validation-selective (>=0.1.0 && <0.2).
|
||||||
# Get rid of this in the next release: https://github.com/kowainik/tomland/commit/37f16460a6dfe4606d48b8b86c13635d409442cd
|
# Get rid of this in the next release: https://github.com/kowainik/tomland/commit/37f16460a6dfe4606d48b8b86c13635d409442cd
|
||||||
tomland = doJailbreak super.tomland;
|
tomland = doJailbreak super.tomland;
|
||||||
|
|
||||||
|
# 2023-04-05: The last version to support libsoup-2.4, required for
|
||||||
|
# compatability with other gi- packages.
|
||||||
|
# Take another look when gi-webkit2 updates as it may have become compatible with libsoup-3
|
||||||
|
gi-soup = assert versions.major self.gi-webkit2.version == "4"; self.gi-soup_2_4_28;
|
||||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||||
|
|
|
@ -90,6 +90,7 @@ extra-packages:
|
||||||
- ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7
|
- ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7
|
||||||
- ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 9.2
|
- ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 9.2
|
||||||
- ghc-lib-parser-ex == 9.4.* # 2023-03-17: preserve for GHC 9.4
|
- ghc-lib-parser-ex == 9.4.* # 2023-03-17: preserve for GHC 9.4
|
||||||
|
- gi-soup == 2.4.28 # 2023-04-05: the last version to support libsoup-2.4 (and thus be compatible with our other gi- packages)
|
||||||
- haddock == 2.23.* # required on GHC < 8.10.x
|
- haddock == 2.23.* # required on GHC < 8.10.x
|
||||||
- haddock-api == 2.23.* # required on GHC < 8.10.x
|
- haddock-api == 2.23.* # required on GHC < 8.10.x
|
||||||
- haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0
|
- haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0
|
||||||
|
|
|
@ -115007,6 +115007,28 @@ self: {
|
||||||
license = lib.licenses.lgpl21Only;
|
license = lib.licenses.lgpl21Only;
|
||||||
}) {inherit (pkgs) libsecret;};
|
}) {inherit (pkgs) libsecret;};
|
||||||
|
|
||||||
|
"gi-soup_2_4_28" = callPackage
|
||||||
|
({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
|
||||||
|
, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
|
||||||
|
, haskell-gi-overloading, libsoup, text, transformers
|
||||||
|
}:
|
||||||
|
mkDerivation {
|
||||||
|
pname = "gi-soup";
|
||||||
|
version = "2.4.28";
|
||||||
|
sha256 = "157yvfwhyvl58va533n0hz509204aszxqspd62x92b6mlf5fxyqk";
|
||||||
|
setupHaskellDepends = [
|
||||||
|
base Cabal gi-gio gi-glib gi-gobject haskell-gi
|
||||||
|
];
|
||||||
|
libraryHaskellDepends = [
|
||||||
|
base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
|
||||||
|
haskell-gi-base haskell-gi-overloading text transformers
|
||||||
|
];
|
||||||
|
libraryPkgconfigDepends = [ libsoup ];
|
||||||
|
description = "Libsoup bindings";
|
||||||
|
license = lib.licenses.lgpl21Only;
|
||||||
|
hydraPlatforms = lib.platforms.none;
|
||||||
|
}) {inherit (pkgs) libsoup;};
|
||||||
|
|
||||||
"gi-soup" = callPackage
|
"gi-soup" = callPackage
|
||||||
({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
|
({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
|
||||||
, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
|
, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue