pyrox.dev / nixpkgs
lol
fork atom

haskellPackages.cabal2nix-unstable: 2021-09-23 -> 2021-09-28

Stops webkitgtk24x-gtk* bindings from being emitted.

sternenseemann e8b91f30 ca33fe38

options
unified split
Changed files
+12 -13
pkgs
development
haskell-modules
cabal2nix-unstable.nix
hackage-packages.nix
+3 -3
pkgs/development/haskell-modules/cabal2nix-unstable.nix 
···

       
8

       
8

       
 

       
}:


     

       
9

       
9

       
 

       
mkDerivation {


     

       
10

       
10

       
 

       
  pname = "cabal2nix";


     

       
11

       

       
-

       
  version = "unstable-2021-09-23";


     

       

       
11

       
+

       
  version = "unstable-2021-09-28";


     

       
12

       
12

       
 

       
  src = fetchzip {


     

       
13

       

       
-

       
    url = "https://github.com/NixOS/cabal2nix/archive/749491a0911601d18fb00e27d15005406d295729.tar.gz";


     

       
14

       

       
-

       
    sha256 = "0a4kd9n7qfbccjwd1f6hmz3wqqidcc6a76j7a1c5qkqpvjxr3mfm";


     

       

       
13

       
+

       
    url = "https://github.com/NixOS/cabal2nix/archive/b4d893ed1a7a66b0046dd8a48f62b81de670ab02.tar.gz";


     

       

       
14

       
+

       
    sha256 = "0xl5a0gfxrqz8pkx43zrj84xvcg15723lgvirxdcvc4zqa732zjg";


     

       
15

       
15

       
 

       
  };


     

       
16

       
16

       
 

       
  isLibrary = true;


     

       
17

       
17

       
 

       
  isExecutable = true;
+9 -10
pkgs/development/haskell-modules/hackage-packages.nix 
···

       
105870

       
105870

       
 

       
    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk


     

       
105871

       
105871

       
 

       
     , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject


     

       
105872

       
105872

       
 

       
     , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base


     

       
105873

       

       
-

       
     , haskell-gi-overloading, text, transformers, webkitgtk24x-gtk3


     

       

       
105873

       
+

       
     , haskell-gi-overloading, text, transformers, webkitgtk


     

       
105874

       
105874

       
 

       
     }:


     

       
105875

       
105875

       
 

       
     mkDerivation {


     

       
105876

       
105876

       
 

       
       pname = "gi-webkit";


     
···

       
105882

       
105882

       
 

       
         gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup


     

       
105883

       
105883

       
 

       
         haskell-gi haskell-gi-base haskell-gi-overloading text transformers


     

       
105884

       
105884

       
 

       
       ];


     

       
105885

       

       
-

       
       libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];


     

       

       
105885

       
+

       
       libraryPkgconfigDepends = [ webkitgtk ];


     

       
105886

       
105886

       
 

       
       doHaddock = false;


     

       
105887

       
105887

       
 

       
       description = "WebKit bindings";


     

       
105888

       
105888

       
 

       
       license = lib.licenses.lgpl21Only;


     

       
105889

       
105889

       
 

       
       hydraPlatforms = lib.platforms.none;


     

       
105890

       

       
-

       
     }) {inherit (pkgs) webkitgtk24x-gtk3;};


     

       

       
105890

       
+

       
     }) {inherit (pkgs) webkitgtk;};


     

       
105891

       
105891

       
 

       



     

       
105892

       
105892

       
 

       
  "gi-webkit2" = callPackage


     

       
105893

       
105893

       
 

       
    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk


     
···

       
286247

       
286247

       
 

       
  "webkitgtk3" = callPackage


     

       
286248

       
286248

       
 

       
    ({ mkDerivation, base, bytestring, Cabal, cairo, glib


     

       
286249

       
286249

       
 

       
     , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers


     

       
286250

       

       
-

       
     , webkitgtk24x-gtk3


     

       

       
286250

       
+

       
     , webkitgtk


     

       
286251

       
286251

       
 

       
     }:


     

       
286252

       
286252

       
 

       
     mkDerivation {


     

       
286253

       
286253

       
 

       
       pname = "webkitgtk3";


     
···

       
286258

       
286258

       
 

       
       libraryHaskellDepends = [


     

       
286259

       
286259

       
 

       
         base bytestring cairo glib gtk3 mtl pango text transformers


     

       
286260

       
286260

       
 

       
       ];


     

       
286261

       

       
-

       
       libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];


     

       

       
286261

       
+

       
       libraryPkgconfigDepends = [ webkitgtk ];


     

       
286262

       
286262

       
 

       
       libraryToolDepends = [ gtk2hs-buildtools ];


     

       
286263

       
286263

       
 

       
       description = "Binding to the Webkit library";


     

       
286264

       
286264

       
 

       
       license = lib.licenses.lgpl21Only;


     

       
286265

       
286265

       
 

       
       hydraPlatforms = lib.platforms.none;


     

       
286266

       

       
-

       
     }) {inherit (pkgs) webkitgtk24x-gtk3;};


     

       

       
286266

       
+

       
     }) {inherit (pkgs) webkitgtk;};


     

       
286267

       
286267

       
 

       



     

       
286268

       
286268

       
 

       
  "webkitgtk3-javascriptcore" = callPackage


     

       
286269

       

       
-

       
    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk24x-gtk3


     

       
286270

       

       
-

       
     }:


     

       

       
286269

       
+

       
    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }:


     

       
286271

       
286270

       
 

       
     mkDerivation {


     

       
286272

       
286271

       
 

       
       pname = "webkitgtk3-javascriptcore";


     

       
286273

       
286272

       
 

       
       version = "0.14.2.1";


     

       
286274

       
286273

       
 

       
       sha256 = "0kcjrka0c9ifq3zfhmkv05wy3xb7v0cyznfxldp2gjcn1haq084j";


     

       
286275

       
286274

       
 

       
       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];


     

       
286276

       
286275

       
 

       
       libraryHaskellDepends = [ base ];


     

       
286277

       

       
-

       
       libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];


     

       

       
286276

       
+

       
       libraryPkgconfigDepends = [ webkitgtk ];


     

       
286278

       
286277

       
 

       
       description = "JavaScriptCore FFI from webkitgtk";


     

       
286279

       
286278

       
 

       
       license = lib.licenses.bsd3;


     

       
286280

       
286279

       
 

       
       hydraPlatforms = lib.platforms.none;


     

       
286281

       

       
-

       
     }) {inherit (pkgs) webkitgtk24x-gtk3;};


     

       

       
286280

       
+

       
     }) {inherit (pkgs) webkitgtk;};


     

       
286282

       
286281

       
 

       



     

       
286283

       
286282

       
 

       
  "webmention" = callPackage


     

       
286284

       
286283

       
 

       
    ({ mkDerivation, base, bytestring, case-insensitive, either